core: rtw_xmit: fix build break — _FW_UNDER_SURVEY -> WIFI_UNDER_SURVEY#201
Closed
breakneck-git wants to merge 1 commit into
Closed
core: rtw_xmit: fix build break — _FW_UNDER_SURVEY -> WIFI_UNDER_SURVEY#201breakneck-git wants to merge 1 commit into
breakneck-git wants to merge 1 commit into
Conversation
PR #198 (the scan_state desync fix that I submitted and you merged on 2026-04-25) introduced three references to `_FW_UNDER_SURVEY` in `core/rtw_xmit.c::rtw_xmit_ac_blocked()`. That identifier is the alias used in the aircrack-ng/rtl8812au tree (defined in include/rtw_mlme.h as `#define _FW_UNDER_SURVEY WIFI_SITE_MONITOR`), but **this fork uses `WIFI_UNDER_SURVEY` directly** (no `_FW_*` alias in include/rtw_mlme.h). Compiler error: core/rtw_xmit.c:6509:41: error: '_FW_UNDER_SURVEY' undeclared (first use in this function); did you mean 'WIFI_UNDER_SURVEY'? The Build CI on main has been failing on every gcc-10/11/12 job since the merge (run 24937185656, 2026-04-25), and the failure also blocks my newer PRs #199 and #200 because they build on top of broken main. This patch is the minimal mechanical rename in the three lines that PR #198 added. No behavioural change, no other identifiers touched. Apologies — when I prepared the morrownr/8821au-20210708 version of PR #198 I copy-pasted the aircrack-ng identifier and didn't run the build locally before pushing (no kernel-headers setup on my side). This PR restores `main` to a buildable state.
|
I was going to open up a PR to fix this too. This should be merged as quickly as possible :) |
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
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.
Summary
Fixes broken Build CI on
main. PR #198 (the scan_state desync fix you merged on 2026-04-25) inadvertently introduced an undefined identifier intocore/rtw_xmit.c, breaking every gcc-10/11/12 job since.Root cause
The patch I prepared for this fork copy-pasted the identifier from the aircrack-ng/rtl8812au tree. There it works because aircrack-ng has:
This fork has no
_FW_*alias —include/rtw_mlme.hexportsWIFI_UNDER_SURVEYdirectly. Compiler error:Build CI run 24937185656 (right after PR #198 merge) shows the failure on all three Ubuntu 22.04 / gcc-10/11/12 jobs. The same break is present on the sister
8812au-20210820fork (its CI is set up differently so the failure was silent there).Fix
Mechanical rename of the three references PR #198 added:
_FW_UNDER_SURVEY→WIFI_UNDER_SURVEY. No behavioural change, the underlying constant is the same.Apology
This was my mistake — when preparing the morrownr/8821au-20210708 variant of PR #198 I copy-pasted the aircrack-ng identifier verbatim and didn't run a local build before pushing (no kernel-headers setup on my side at the time). I should have noticed the diff in macro names between the trees during cross-fork review. Sorry for the noise.
The companion fix for
8812au-20210820is at https://github.com/morrownr/8812au-20210820/pull/{NUM} (will be opened right after this).Effect on other open PRs
After this lands, my open PRs #199 (P2P/WFD attr_len underflow) and #200 (USB submit-failure counter leak) should re-build cleanly — the failures on those PRs are inherited from broken
main, not from their own changes.