[noup] zephyr: add support for nan#119
Open
Qingling-Wu wants to merge 2 commits intozephyrproject-rtos:mainfrom
Open
[noup] zephyr: add support for nan#119Qingling-Wu wants to merge 2 commits intozephyrproject-rtos:mainfrom
Qingling-Wu wants to merge 2 commits intozephyrproject-rtos:mainfrom
Conversation
Qingling-Wu
requested review from
MaochenWang1,
jukkar and
krish2718
as code owners
Qingling-Wu
force-pushed
the
main_ql_paf
branch
2 times, most recently
from
01c61a8 to
566596c
Compare
krish2718
reviewed
Jan 30, 2026
Qingling-Wu
force-pushed
the
main_ql_paf
branch
from
566596c to
34aa8af
Compare
jukkar
reviewed
Feb 10, 2026
src/drivers/driver_zephyr.c
Outdated
| u32 vendor_type = 0; | ||
|
|
||
| /* Minimum length: MAC header (24) + Category (1) + PA (1) + OUI+Type (4) */ | ||
| if (len < 30) |
Member
There was a problem hiding this comment.
Could you follow the coding style used in the other parts of this file.
if (len < 30) {
....
}
Implement NAN Service Discovery Frame detection in the Zephyr WiFi driver to support WiFi Aware functionality. - Add is_nan_sdf_frame() to identify NAN SDF frames - Generate EVENT_TX_WAIT_EXPIRE for NAN SDF TX completion - Enable proper NAN discovery flow in Zephyr environment Signed-off-by: Qingling Wu <qingling.wu@nxp.com>
Qingling-Wu
force-pushed
the
main_ql_paf
branch
from
34aa8af to
4884e8c
Compare
krish2718
approved these changes
Feb 27, 2026
MaochenWang1
reviewed
Mar 9, 2026
| #include "wpas_kay.h" | ||
| #include "mesh.h" | ||
| #include "dpp_supplicant.h" | ||
| #include "nan_usd.h" |
Collaborator
There was a problem hiding this comment.
Hi @Qingling-Wu , if this change is from https://w1.fi/cgit/hostap/, then you can cherry-pick that commit with [fromtree] tag in the commit header.
Contributor
Author
There was a problem hiding this comment.
Thanks for your review! I've updated the commit to use the [fromtree] tag and follow the standard format used in this repository.
I found that the full NAN USD implementation from upstream commit e3f9ab3 is already present in Zephyr's hostap, but the initialization and cleanup calls in wpa_supplicant.c were missing. This change adds those missing calls.
Initialize NAN Unsynchronized Service Discovery (USD) during wpa_supplicant interface initialization and cleanup. The full NAN USD implementation from upstream commit e3f9ab3 is already present in Zephyr's hostap repository, including: - NAN USD core implementation (nan_usd.c, nan_usd.h) - Control interface commands (NAN_PUBLISH, NAN_SUBSCRIBE, etc.) - Event handling (wpas_nan_usd_rx_sdf, etc.) - Driver integration (NAN SDF registration) However, the initialization and cleanup calls in wpa_supplicant.c were missing. This change adds the missing initialization code: - Add #include "nan_usd.h" - Call wpas_nan_usd_init() during interface initialization - Call wpas_nan_usd_deinit() during cleanup Signed-off-by: Jouni Malinen <quic_jouni@quicinc.com> (cherry picked from commit e3f9ab3) Signed-off-by: Qingling Wu <qingling.wu@nxp.com>
Qingling-Wu
force-pushed
the
main_ql_paf
branch
from
4884e8c to
231fb1f
Compare
jukkar
approved these changes
Mar 12, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.