Snap for 11200149 from 77f5f11fc5 to 24D1-release

Change-Id: I57695d9b68e6fdd8cafcf4e73dc9cfbee853989c
This commit is contained in:
Android Build Coastguard Worker 2023-12-09 04:17:46 +00:00
commit 3f092a624d
2 changed files with 14 additions and 4 deletions

View file

@ -126,7 +126,7 @@ typedef enum {
*/
typedef enum {
WIFI_VOIP_MODE_OFF = 0,
WIFI_VOIP_MODE_ON = 1,
WIFI_VOIP_MODE_VOICE = 1,
} wifi_voip_mode;
/* List of interface types supported */
@ -469,6 +469,8 @@ void wifi_get_error_info(wifi_error err, const char **msg); // return a pointer
#define WIFI_FEATURE_INFRA_60G (uint64_t)0x100000000 // Support for 60GHz Band
#define WIFI_FEATURE_AFC_CHANNEL (uint64_t)0x200000000 // Support for setting 6GHz AFC channel allowance
#define WIFI_FEATURE_T2LM_NEGO (uint64_t)0x400000000 // Support for TID-To-Link mapping negotiation
#define WIFI_FEATURE_ROAMING_MODE_CONTROL (uint64_t)0x800000000 // Support for configuring roaming mode
#define WIFI_FEATURE_SET_VOIP_MODE (uint64_t)0x1000000000 // Support Voip mode setting
// Add more features here
#define IS_MASK_SET(mask, flags) (((flags) & (mask)) == (mask))

View file

@ -2850,7 +2850,7 @@ typedef struct {
Initiator side
*/
typedef struct {
/* Publish or Subscribe Id of an earlier Publish/Subscribe */
/* Publish instance id generated on Publisher side corresponding to a session */
u16 publish_subscribe_id;
/*
This Id is the Requestor Instance that is passed as
@ -2923,6 +2923,9 @@ typedef struct {
NAN pairing bootstrapping initiator request
*/
typedef struct {
/* Publish or Subscribe Id of local Publish/Subscribe */
u16 publish_subscribe_id;
/*
This Id is the Requestor Instance that is passed as
part of earlier MatchInd/FollowupInd message.
@ -2951,6 +2954,9 @@ typedef struct {
u16 sdea_service_specific_info_len;
u8 sdea_service_specific_info[NAN_MAX_SDEA_SERVICE_SPECIFIC_INFO_LEN];
/* Indicates that this is comeback Bootstrapping request */
u8 comeback;
/* The length of cookie. */
u32 cookie_length;
@ -2962,9 +2968,11 @@ typedef struct {
NAN pairing bootstrapping response from responder to a initate request
*/
typedef struct {
/* Publish or Subscribe Id of local Publish/Subscribe */
u16 publish_subscribe_id;
/*
This Id is the Requestor Instance that is passed as
This Id is the Peer Instance that is passed as
part of earlier MatchInd/FollowupInd message.
*/
u32 service_instance_id;
@ -3001,7 +3009,7 @@ typedef struct {
} NanBootstrappingIndicationResponse;
/*
Event indication received on the responder side when a Nan boostrapping session is initiated on
Event indication received on the responder side when a Nan bootsrapping session is initiated on
the Initiator side
*/
typedef struct {