[PATCH v2 20/35] wpa_supplicant: Refactor NAN USD

[Jouni Malinen]

On Tue, Dec 23, 2025 at 01:46:09PM +0200, Andrei Otcheretianski wrote:
> NAN USD and synchronized discovery have a lot of common parts,
> combine them together:
>  - Rename "usd" functions that are common for sync NAN as well.
>  - Combine nan_usd.c/h with nan_supplicant.c/h files.
>  - Provide better inline stubs for all the nan functions to reduce ifdef
>    usage in core supplicant code.

>  wpa_supplicant/nan_supplicant.c         | 661 +++++++++++++++++++++++
>  wpa_supplicant/nan_supplicant.h         | 112 ++++
>  wpa_supplicant/nan_usd.c                | 667 ------------------------
>  wpa_supplicant/nan_usd.h                |  53 --

I applied patches 1-19 with cleanup. However, this refactoring is way
too risky for me to try to merge with other changes that have happened
in parallel and that move of everything from wpa_supplicant/nan_usd.c to
another file. Furthermore, this would be much nicer for review if that
file move were split into a separate commit that moves the contents
without changes and then the renaming of functions (etc.) would be in a
separate patch.

Could you please send an updated version of this refactoring work on top
of the current hostap.git snapshot?

I'm also dropping the other remaining patches 21-35 since I'm not sure
which ones of those might depend on this refactoring. If some of those
patches are independent, feel free to send them separately if that is
easier to get most changes in first.

-- 
Jouni Malinen                                            PGP id EFC895FA