3
0
Fork 0
forked from mirrors/linux
kernel/drivers/net/wireless/microchip/wilc1000
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
..
cfg80211.c wifi: cfg80211: pass net_device to .set_monitor_channel 2024-10-23 16:45:35 +02:00
cfg80211.h wifi: wilc1000: Register wiphy after reading out chipid 2024-10-17 19:47:42 +03:00
fw.h wifi: wilc1000: add function to read mac address from eFuse 2024-05-17 11:01:51 +03:00
hif.c wifi: wilc1000: fix potential RCU dereference issue in wilc_parse_join_bss_param 2024-09-09 15:28:47 +03:00
hif.h wifi: wilc1000: set wilc_set_mac_address parameter as const 2024-05-17 11:01:51 +03:00
Kconfig
Makefile
mon.c wifi: radiotap: Avoid -Wflex-array-member-not-at-end warnings 2024-10-08 21:24:20 +02:00
netdev.c wifi: wilc1000: Set MAC after operation mode 2024-10-17 19:48:55 +03:00
netdev.h wifi: wilc1000: remove suspend/resume from cfg80211 part 2024-06-18 13:23:16 +03:00
sdio.c wifi: wilc1000: Add WILC3000 support 2024-10-17 19:47:42 +03:00
spi.c wifi: wilc1000: Add WILC3000 support 2024-10-17 19:47:42 +03:00
wlan.c wifi: wilc1000: Add WILC3000 support 2024-10-17 19:47:42 +03:00
wlan.h wifi: wilc1000: Add WILC3000 support 2024-10-17 19:47:42 +03:00
wlan_cfg.c
wlan_cfg.h
wlan_if.h