1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
linux/drivers/net/wireless/ath/wil6210
Jakub Kicinski 5b1c965956 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR (net-6.12-rc6).

Conflicts:

drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c
  cbe84e9ad5 ("wifi: iwlwifi: mvm: really send iwl_txpower_constraints_cmd")
  188a1bf894 ("wifi: mac80211: re-order assigning channel in activate links")
https://lore.kernel.org/all/20241028123621.7bbb131b@canb.auug.org.au/

net/mac80211/cfg.c
  c4382d5ca1 ("wifi: mac80211: update the right link for tx power")
  8dd0498983 ("wifi: mac80211: Fix setting txpower with emulate_chanctx")

drivers/net/ethernet/intel/ice/ice_ptp_hw.h
  6e58c33106 ("ice: fix crash on probe for DPLL enabled E810 LOM")
  e4291b64e1 ("ice: Align E810T GPIO to other products")
  ebb2693f8f ("ice: Read SDP section from NVM for pin definitions")
  ac532f4f42 ("ice: Cleanup unused declarations")
https://lore.kernel.org/all/20241030120524.1ee1af18@canb.auug.org.au/

No adjacent changes.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2024-10-31 18:10:07 -07:00
..
boot_loader.h wil6210: add SPDX license identifiers 2019-10-31 10:16:10 +02:00
cfg80211.c wifi: cfg80211: pass net_device to .set_monitor_channel 2024-10-23 16:45:35 +02:00
debug.c wil6210: add SPDX license identifiers 2019-10-31 10:16:10 +02:00
debugfs.c wifi: wil6210: debugfs: use DEFINE_SHOW_ATTRIBUTE to simplify fw_capabilities/fw_version 2022-09-28 10:45:20 +03:00
ethtool.c ethtool: extend coalesce setting uAPI with CQE mode 2021-08-24 07:38:29 -07:00
fw.c wil6210: add SPDX license identifiers 2019-10-31 10:16:10 +02:00
fw.h wifi: wil6210: fix sparse warnings 2024-03-25 12:50:42 +02:00
fw_inc.c wifi: wil6210: fix sparse warnings 2024-03-25 12:50:42 +02:00
interrupt.c wil6210: Fix wrong function name in comments 2021-06-15 17:01:25 +03:00
Kconfig wil6210: select CONFIG_CRC32 2021-01-05 15:50:36 -08:00
main.c wifi: move from strlcpy with unused retval to strscpy 2022-09-02 11:47:22 +03:00
Makefile ath: fix SPDX tags 2019-06-26 18:11:06 +03:00
netdev.c wifi: wil6210: Do not use embedded netdev in wil6210_priv 2024-05-07 13:05:24 +03:00
p2p.c wil6210: add SPDX license identifiers 2019-10-31 10:16:10 +02:00
pcie_bus.c cfg80211: avoid holding the RTNL when calling the driver 2021-01-26 11:55:50 +01:00
pm.c wil6210: use pm_runtime_resume_and_get() instead of pm_runtime_get_sync() 2022-04-23 12:31:48 +03:00
pmc.c wil6210: pmc: Demote a few nonconformant kernel-doc function headers 2020-08-31 18:18:40 +03:00
pmc.h wil6210: add SPDX license identifiers 2019-10-31 10:16:10 +02:00
rx_reorder.c wil6210: add SPDX license identifiers 2019-10-31 10:16:10 +02:00
trace.c wil6210: add SPDX license identifiers 2019-10-31 10:16:10 +02:00
trace.h tracing/ath: Use the new __vstring() helper 2022-07-15 17:44:40 -04:00
txrx.c wifi: radiotap: Avoid -Wflex-array-member-not-at-end warnings 2024-10-08 21:24:20 +02:00
txrx.h wifi: wil6210: fix fortify warnings 2023-07-27 19:12:49 +03:00
txrx_edma.c wifi: wil6210: fix fortify warnings 2023-07-27 19:12:49 +03:00
txrx_edma.h wifi: wil6210: fix fortify warnings 2023-07-27 19:12:49 +03:00
wil6210.h wifi: wil6210: Do not use embedded netdev in wil6210_priv 2024-05-07 13:05:24 +03:00
wil_crash_dump.c wil6210: take mem_lock for writing in crash dump collection 2019-12-19 18:15:56 +02:00
wil_platform.c wil6210: wil_platform: Demote kernel-doc header to standard comment block 2020-08-31 18:18:43 +03:00
wil_platform.h wil6210: add SPDX license identifiers 2019-10-31 10:16:10 +02:00
wmi.c wifi: wil6210: wmi: Use __counted_by() in struct wmi_set_link_monitor_cmd and avoid -Wfamnae warning 2024-04-04 13:12:20 +03:00
wmi.h wifi: wil6210: wmi: Use __counted_by() in struct wmi_set_link_monitor_cmd and avoid -Wfamnae warning 2024-04-04 13:12:20 +03:00