linux/drivers/net/wireless/intel/iwlwifi/mvm
Johannes Berg c924c5e9b8 Merge net-next/main to resolve conflicts
There are a few conflicts between the work that went
into wireless and that's here now, resolve them.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2025-03-18 09:46:36 +01:00
..
tests wifi: iwlwifi: Allow entering EMLSR for more band combinations 2025-01-13 15:26:40 +01:00
Makefile wifi: iwlwifi: mvm: replace CONFIG_PM by CONFIG_PM_SLEEP 2024-09-06 12:56:03 +02:00
binding.c wifi: iwlwifi: simplify nested if checks 2025-01-13 15:34:09 +01:00
coex.c wifi: iwlwifi: mvm: avoid NULL pointer dereference 2025-01-13 15:26:41 +01:00
constants.h wifi: iwlwifi: mvm: MLO scan upon channel condition degradation 2024-11-07 14:42:29 +01:00
d3.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2025-03-06 13:03:35 -08:00
debugfs-vif.c wifi: iwlwifi: s/IWL_MVM_INVALID_STA/IWL_INVALID_STA 2024-11-07 14:42:30 +01:00
debugfs.c Merge net-next/main to resolve conflicts 2025-03-18 09:46:36 +01:00
debugfs.h
ftm-initiator.c wifi: iwlwifi: mvm: fix setting the TK when associated 2025-03-11 16:29:23 +01:00
ftm-responder.c wifi: iwlwifi: mvm: Remove unused iwl_mvm_ftm_*_add_pasn_sta functions 2025-02-11 11:48:25 +01:00
fw-api.h
fw.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2025-03-13 23:08:11 +01:00
led.c
link.c wifi: iwlwifi: simplify nested if checks 2025-01-13 15:34:09 +01:00
mac-ctxt.c wifi: iwlwifi: mvm: Remove unused iwl_mvm_rx_missed_vap_notif 2025-02-11 11:48:21 +01:00
mac80211.c wifi: iwlwifi: w/a FW SMPS mode selection 2025-03-11 10:54:01 +01:00
mld-key.c wifi: iwlwifi: s/IWL_MVM_INVALID_STA/IWL_INVALID_STA 2024-11-07 14:42:30 +01:00
mld-mac.c
mld-mac80211.c wifi: iwlwifi: w/a FW SMPS mode selection 2025-03-11 10:54:01 +01:00
mld-sta.c wifi: iwlwifi: remove the mvm prefix from iwl_mvm_aux_sta_cmd 2025-02-11 11:57:28 +01:00
mvm.h wifi: iwlwifi: w/a FW SMPS mode selection 2025-03-11 10:54:01 +01:00
nvm.c wifi: iwlwifi: mvm: Stop processing MCC update if there was no change 2024-08-27 10:28:54 +02:00
offloading.c wifi: iwlwifi: mvm: support new versions of the wowlan APIs 2024-11-07 14:42:29 +01:00
ops.c wifi: iwlwifi: remove mvm prefix from iwl_mvm_esr_mode_notif 2025-02-26 15:48:54 +01:00
phy-ctxt.c wifi: iwlwifi: mvm: Fix duplicated 'the' in comment 2025-01-13 15:26:43 +01:00
power.c wifi: iwlwifi: mvm: Improve code style in pointer declarations 2025-01-13 15:26:42 +01:00
ptp.c
quota.c
rfi.c wifi: iwlwifi: mvm: rfi: fix potential response leaks 2024-03-25 15:23:07 +01:00
rs-fw.c wifi: iwlwifi: mvm: remove redundant check 2024-10-23 16:44:04 +02:00
rs.c wifi: iwlwifi: Fix spelling mistake "Increate" -> "Increase" 2025-02-28 13:39:04 +01:00
rs.h wifi: iwlwifi: mvm: fix rs.h kernel-doc 2024-06-26 10:35:15 +02:00
rx.c wifi: iwlwifi: add channel_load_not_by_us in iwl_mvm_phy_ctxt 2025-01-13 15:26:40 +01:00
rxmq.c wifi: iwlwifi: mvm: use the right version of the rate API 2025-02-11 12:41:46 +01:00
scan.c wifi: iwlwifi: mvm: fix iwl_ssid_exist() check 2025-01-13 15:26:42 +01:00
sf.c
sta.c wifi: iwlwifi: mvm: Remove unused iwl_mvm_ftm_*_add_pasn_sta functions 2025-02-11 11:48:25 +01:00
sta.h wifi: iwlwifi: mvm: Remove unused iwl_mvm_ftm_*_add_pasn_sta functions 2025-02-11 11:48:25 +01:00
tdls.c wifi: iwlwifi: mvm: Use helper function IS_ERR_OR_NULL() 2025-01-13 15:26:42 +01:00
testmode.h
time-event.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2025-03-06 13:03:35 -08:00
time-event.h
time-sync.c
time-sync.h
tt.c wifi: iwlwifi: remove the version number from iwl_dts_measurement_notif_v2 2025-02-11 11:57:22 +01:00
tx.c wifi: iwlwifi: mvm: don't count mgmt frames as MPDU 2025-01-13 15:26:41 +01:00
utils.c wifi: iwlwifi: s/IWL_MVM_INVALID_STA/IWL_INVALID_STA 2024-11-07 14:42:30 +01:00
vendor-cmd.c wifi: iwlwifi: mvm: Replace spaces for tabs in iwl_mvm_vendor_events_idx 2024-12-04 16:11:59 +01:00