From 35761b6c1fbfdd88fb21e593bde4992cfbdcfc4d Mon Sep 17 00:00:00 2001 From: Chaitanya Tata Date: Mon, 26 Feb 2024 22:32:54 +0530 Subject: [PATCH 1/3] [nrf noup] ci: Fix the path for running compliance fixup![nrf noup] ci: Fix the paths The compliance should be run from hostap repo and not sdk-zephyr. And also disable few tests that won't work reliably. Signed-off-by: Chaitanya Tata --- .github/workflows/compliance.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/compliance.yml b/.github/workflows/compliance.yml index 26ed4d770..681168374 100644 --- a/.github/workflows/compliance.yml +++ b/.github/workflows/compliance.yml @@ -59,15 +59,14 @@ jobs: id: compliance env: BASE_REF: ${{ github.base_ref }} - working-directory: sdk-zephyr if: contains(github.event.pull_request.user.login, 'dependabot[bot]') != true run: | - export ZEPHYR_BASE="$(dirname "$(pwd)")/sdk-zephyr" + export ZEPHYR_BASE="$(dirname "$(pwd)")/sdk-hostap/sdk-zephyr" # debug ls -la git log --pretty=oneline | head -n 10 - ./scripts/ci/check_compliance.py --annotate -e gitlint -e KconfigBasic -e Kconfig \ - -e ModulesMaintainers -c origin/${BASE_REF}.. + $ZEPHYR_BASE/scripts/ci/check_compliance.py --annotate -e ModulesMaintainers -e KconfigBasicNoModules -e KconfigBasic -e Kconfig \ + -c origin/${BASE_REF}.. - name: upload-results uses: actions/upload-artifact@v3 @@ -75,14 +74,16 @@ jobs: if: contains(github.event.pull_request.user.login, 'dependabot[bot]') != true with: name: compliance.xml - path: sdk-zephyr/compliance.xml + path: sdk-hostap - name: check-warns if: contains(github.event.pull_request.user.login, 'dependabot[bot]') != true run: | + echo $(pwd) + ls -la export ZEPHYR_BASE="$(dirname "$(pwd)")/sdk-hostap/sdk-zephyr" - if [[ ! -s $ZEPHYR_BASE/"compliance.xml" ]]; then - echo "::error ::compliance.xml not found in $ZEPHYR_BASE" + if [[ ! -s $(dirname "$(pwd)")/sdk-hostap/compliance.xml ]]; then + echo "::error ::compliance.xml not found in $(dirname "$(pwd)")/sdk-hostap/compliance.xml" exit 1; fi From 1bd59868e2a29be132c3326e81386cffb6d46d2d Mon Sep 17 00:00:00 2001 From: Chaitanya Tata Date: Thu, 29 Feb 2024 13:32:03 +0530 Subject: [PATCH 2/3] [nrf noup] zephyr: Fix checkpatch warnings fixup! [nrf noup] zephyr: Fix association response event processing Fix compliance. Signed-off-by: Chaitanya Tata --- src/drivers/driver_zephyr.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/drivers/driver_zephyr.c b/src/drivers/driver_zephyr.c index 495d59f08..e487a2976 100644 --- a/src/drivers/driver_zephyr.c +++ b/src/drivers/driver_zephyr.c @@ -112,7 +112,8 @@ void wpa_supplicant_event_wrapper(void *ctx, return; } - os_memcpy(req_ies, data->assoc_info.req_ies, data->assoc_info.req_ies_len); + os_memcpy(req_ies, data->assoc_info.req_ies, + data->assoc_info.req_ies_len); data_tmp->assoc_info.req_ies = req_ies; } if (data->assoc_info.resp_ies) { @@ -124,7 +125,8 @@ void wpa_supplicant_event_wrapper(void *ctx, return; } - os_memcpy(resp_ies, data->assoc_info.resp_ies, data->assoc_info.resp_ies_len); + os_memcpy(resp_ies, data->assoc_info.resp_ies, + data->assoc_info.resp_ies_len); data_tmp->assoc_info.resp_ies = resp_ies; } if (data->assoc_info.resp_frame) { @@ -136,7 +138,8 @@ void wpa_supplicant_event_wrapper(void *ctx, return; } - os_memcpy(resp_frame, data->assoc_info.resp_frame, data->assoc_info.resp_frame_len); + os_memcpy(resp_frame, data->assoc_info.resp_frame, + data->assoc_info.resp_frame_len); data_tmp->assoc_info.resp_frame = resp_frame; } } else if (event == EVENT_ASSOC_REJECT) { From ce1114343594cd07e07bcfc97f1361d73996ec81 Mon Sep 17 00:00:00 2001 From: Chaitanya Tata Date: Thu, 29 Feb 2024 13:34:17 +0530 Subject: [PATCH 3/3] [nrf noup] zephyr: Fix checkpatch warnings fixup! nrf noup] zephyr: Fix deep copy of remaining events Fix compliance. Signed-off-by: Chaitanya Tata --- src/drivers/driver_zephyr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/drivers/driver_zephyr.c b/src/drivers/driver_zephyr.c index e487a2976..34c0ef162 100644 --- a/src/drivers/driver_zephyr.c +++ b/src/drivers/driver_zephyr.c @@ -164,7 +164,8 @@ void wpa_supplicant_event_wrapper(void *ctx, return; } - os_memcpy(resp_ies, data->assoc_reject.resp_ies, data->assoc_reject.resp_ies_len); + os_memcpy(resp_ies, data->assoc_reject.resp_ies, + data->assoc_reject.resp_ies_len); data_tmp->assoc_reject.resp_ies = resp_ies; } } else if (event == EVENT_DEAUTH) {