diff options
| author | Isaac J. Manjarres <isaacmanjarres@google.com> | 2024-02-12 06:18:13 -0800 |
|---|---|---|
| committer | Andrew Evans <andrewevans@google.com> | 2024-02-12 20:51:35 +0000 |
| commit | 1eeda34c96838cee19f2f0b6234302c11702904f (patch) | |
| tree | 8ca5b4c2b961d6266d78a9b37d24f580e4764fb6 | |
| parent | 1bf56f40e2224aaeed8eb4ed0fb2e878acededba (diff) | |
| download | common-android14-5.15-2023-11_r11.tar.gz | |
ANDROID: GKI: Preserve CRC value for wireless_send_event()android14-5.15-2023-11_r11
Commit d7c1a9a0ed18 ("wifi: nl80211: validate and configure puncturing
bitmap") and commit 9b89495e479c ("wifi: nl80211: Allow authentication
frames and set keys on NAN interface") added two entries to the
nl80211_ext_feature_index enum, which caused the CRC value for the
wireless_send_event() symbol to change.
Fix this by hiding the new enum entries during the CRC generation phase.
While the values of NUM_NL80211_EXT_FEATURES and
MAX_NL80211_EXT_FEATURES have changed, it shouldn't be a problem in this
case, since MAX_NL80211_EXT_FEATURES is not used in the kernel source,
and the one usage of NUM_NL80211_EXT_FEATURES remains unchanged.
Bug: 272227555
Bug: 324871355
Bug: 324905919
Change-Id: I8b5be4c39b1ab72f0f2b3c9ff10f15a981a431db
Signed-off-by: Isaac J. Manjarres <isaacmanjarres@google.com>
| -rw-r--r-- | include/uapi/linux/nl80211.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h index 75f7aa80bda8..c26638050db2 100644 --- a/include/uapi/linux/nl80211.h +++ b/include/uapi/linux/nl80211.h @@ -6374,8 +6374,14 @@ enum nl80211_ext_feature_index { NL80211_EXT_FEATURE_FILS_CRYPTO_OFFLOAD, NL80211_EXT_FEATURE_RADAR_BACKGROUND, NL80211_EXT_FEATURE_POWERED_ADDR_CHANGE, + /* + * ANDROID CRC kabi preservation hack due to commits d7c1a9a0ed18 + * and 9b89495e479c. + */ +#ifndef __GENKSYMS__ NL80211_EXT_FEATURE_PUNCT, NL80211_EXT_FEATURE_SECURE_NAN, +#endif /* add new features before the definition below */ NUM_NL80211_EXT_FEATURES, |