Revert "[wpa_supplicant] cumilative patch from commit 3a5d1a7e6"
Revert submission 26533062-Supplicant_merge_June24
Reason for revert: https://b.corp.google.com/issues/349780869
Reverted changes: /q/submissionid:26533062-Supplicant_merge_June24
Change-Id: I4a7a5b8ccb6b4822353bacc29649587cd5a3cb80
diff --git a/src/ap/sta_info.h b/src/ap/sta_info.h
index b136ff7..e2b9dde 100644
--- a/src/ap/sta_info.h
+++ b/src/ap/sta_info.h
@@ -17,7 +17,6 @@
#include "common/sae.h"
#include "crypto/sha384.h"
#include "pasn/pasn_common.h"
-#include "hostapd.h"
/* STA flags */
#define WLAN_STA_AUTH BIT(0)
@@ -82,18 +81,18 @@
} common_info;
struct mld_link_info {
- u8 valid:1;
- u8 nstr_bitmap_len:2;
+ u8 valid;
u8 local_addr[ETH_ALEN];
u8 peer_addr[ETH_ALEN];
+ size_t nstr_bitmap_len;
u8 nstr_bitmap[2];
u16 capability;
u16 status;
- u16 resp_sta_profile_len;
- u8 *resp_sta_profile;
+ size_t resp_sta_profile_len;
+ u8 resp_sta_profile[EHT_ML_MAX_STA_PROF_LEN];
const u8 *rsne, *rsnxe;
} links[MAX_NUM_MLD_LINKS];
@@ -394,10 +393,6 @@
void ap_sta_disconnect(struct hostapd_data *hapd, struct sta_info *sta,
const u8 *addr, u16 reason);
-bool ap_sta_set_authorized_flag(struct hostapd_data *hapd, struct sta_info *sta,
- int authorized);
-void ap_sta_set_authorized_event(struct hostapd_data *hapd,
- struct sta_info *sta, int authorized);
void ap_sta_set_authorized(struct hostapd_data *hapd,
struct sta_info *sta, int authorized);
static inline int ap_sta_is_authorized(struct sta_info *sta)
@@ -420,24 +415,4 @@
void ap_free_sta_pasn(struct hostapd_data *hapd, struct sta_info *sta);
-static inline bool ap_sta_is_mld(struct hostapd_data *hapd,
- struct sta_info *sta)
-{
-#ifdef CONFIG_IEEE80211BE
- return hapd->conf->mld_ap && sta && sta->mld_info.mld_sta;
-#else /* CONFIG_IEEE80211BE */
- return false;
-#endif /* CONFIG_IEEE80211BE */
-}
-
-static inline void ap_sta_set_mld(struct sta_info *sta, bool mld)
-{
-#ifdef CONFIG_IEEE80211BE
- if (sta)
- sta->mld_info.mld_sta = mld;
-#endif /* CONFIG_IEEE80211BE */
-}
-
-void ap_sta_free_sta_profile(struct mld_info *info);
-
#endif /* STA_INFO_H */