Johannes Berg a0efa2f362 Merge net-next/main to resolve conflicts ...

The wireless-next tree was based on something older, and there
are now conflicts between -rc2 and work here. Merge net-next,
which has enough of -rc2 for the conflicts to happen, resolving
them in the process.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

2024-10-09 08:59:22 +02:00

..

certs

wifi: cfg80211: fix certs build to not depend on file order

2023-12-14 09:11:51 +01:00

tests

wifi: cfg80211: reject non-conformant 6 GHz center frequencies

2024-06-12 13:04:25 +02:00

.gitignore

.gitignore: add SPDX License Identifier

2020-03-25 11:50:48 +01:00

ap.c

wifi: cfg80211: remove wdev mutex

2023-09-11 11:27:23 +02:00

chan.c

wifi: mac80211, cfg80211: miscellaneous spelling fixes

2024-10-08 21:52:09 +02:00

core.c

wifi: cfg80211: check radio iface combination for multi radio per wiphy

2024-10-08 21:52:11 +02:00

core.h

wifi: cfg80211: skip indicating signal for per-STA profile BSSs

2024-09-06 12:56:33 +02:00

debugfs.c

wifi: cfg80211: add locked debugfs wrappers

2023-11-27 11:24:58 +01:00

debugfs.h

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

ethtool.c

wifi: cfg80211: use strscpy to replace strlcpy

2022-07-15 11:43:12 +02:00

ibss.c

wifi: cfg80211: move DFS related members to links[] in wireless_dev

2024-09-06 13:01:05 +02:00

Kconfig

wifi: cfg80211: stop exporting wext symbols

2024-10-08 21:53:31 +02:00

Makefile

wifi: wext/libipw: move spy implementation to libipw

2024-10-08 21:53:18 +02:00

mesh.c

wifi: cfg80211: move DFS related members to links[] in wireless_dev

2024-09-06 13:01:05 +02:00

mlme.c

wifi: cfg80211/mac80211: use proper link ID for DFS

2024-09-06 13:01:05 +02:00

nl80211.c

wifi: nl80211: remove redundant null pointer check in coalescing

2024-10-08 21:52:15 +02:00

nl80211.h

wifi: nl80211: clean up coalescing rule handling

2024-05-29 10:38:53 +02:00

ocb.c

wifi: cfg80211: remove wdev mutex

2023-09-11 11:27:23 +02:00

of.c

cfg80211: support ieee80211-freq-limit DT property

2017-01-06 14:01:13 +01:00

pmsr.c

wifi: nl80211: remove the FTMs per burst limit for NDP ranging

2024-06-12 13:04:25 +02:00

radiotap.c

Merge net-next/main to resolve conflicts

2024-10-09 08:59:22 +02:00

rdev-ops.h

wifi: cfg80211: handle DFS per link

2024-09-06 13:01:05 +02:00

reg.c

wifi: mac80211, cfg80211: miscellaneous spelling fixes

2024-10-08 21:52:09 +02:00

reg.h

wifi: cfg80211: add return docs for regulatory functions

2024-04-19 10:29:08 +02:00

scan.c

wifi: cfg80211: stop exporting wext symbols

2024-10-08 21:53:31 +02:00

sme.c

wifi: cfg80211: fix two more possible UBSAN-detected off-by-one errors

2024-09-09 11:43:21 +02:00

sysfs.c

wifi: cfg80211: fully move wiphy work to unbound workqueue

2024-05-29 15:23:33 +02:00

sysfs.h

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

trace.c

…

trace.h

wifi: cfg80211: handle DFS per link

2024-09-06 13:01:05 +02:00

util.c

wifi: mac80211, cfg80211: miscellaneous spelling fixes

2024-10-08 21:52:09 +02:00

wext-compat.c

wifi: cfg80211: stop exporting wext symbols

2024-10-08 21:53:31 +02:00

wext-compat.h

Revert "wifi: cfg80211: unexport wireless_nlevent_flush()"

2024-10-09 08:53:01 +02:00

wext-core.c

Revert "wifi: cfg80211: unexport wireless_nlevent_flush()"

2024-10-09 08:53:01 +02:00

wext-priv.c

…

wext-proc.c

proc: introduce proc_create_net{,_data}

2018-05-16 07:24:30 +02:00

wext-sme.c

wifi: cfg80211: remove wdev mutex

2023-09-11 11:27:23 +02:00