Browse Source

qcacld-3.0: Remove obsolete legacy NAN data structures

NAN componentization removed the usage of most legacy NAN data
structures in sir_api.h, so remove those that are no longer used.

Change-Id: I8389dee19a8a044e8d06ff52207fc11a3bbf97a0
CRs-Fixed: 3424918
Jeff Johnson 2 years ago
parent
commit
1e578993f3
1 changed files with 0 additions and 320 deletions
  1. 0 320
      core/mac/inc/sir_api.h

+ 0 - 320
core/mac/inc/sir_api.h

@@ -4085,44 +4085,6 @@ struct sir_apf_get_offload {
 };
 
 #ifdef WLAN_FEATURE_NAN
-#define IFACE_NAME_SIZE 64
-
-/**
- * enum ndp_accept_policy - nan data path accept policy
- * @NDP_ACCEPT_POLICY_NONE: the framework will decide the policy
- * @NDP_ACCEPT_POLICY_ALL: accept policy offloaded to fw
- *
- */
-enum ndp_accept_policy {
-	NDP_ACCEPT_POLICY_NONE = 0,
-	NDP_ACCEPT_POLICY_ALL = 1,
-};
-
-/**
- * enum ndp_self_role - nan data path role
- * @NDP_ROLE_INITIATOR: initiator of nan data path request
- * @NDP_ROLE_RESPONDER: responder to nan data path request
- *
- */
-enum ndp_self_role {
-	NDP_ROLE_INITIATOR = 0,
-	NDP_ROLE_RESPONDER = 1,
-};
-
-/**
- * enum ndp_response_code - responder's response code to nan data path request
- * @NDP_RESPONSE_ACCEPT: ndp request accepted
- * @NDP_RESPONSE_REJECT: ndp request rejected
- * @NDP_RESPONSE_DEFER: ndp request deferred until later (response to follow
- * any time later)
- *
- */
-enum ndp_response_code {
-	NDP_RESPONSE_ACCEPT = 0,
-	NDP_RESPONSE_REJECT = 1,
-	NDP_RESPONSE_DEFER = 2,
-};
-
 /**
  * enum ndp_end_type - NDP end type
  * @NDP_END_TYPE_UNSPECIFIED: type is unspecified
@@ -4196,67 +4158,6 @@ enum nan_reason_code {
 	NDP_VENDOR_SPECIFIC_ERROR = 9500,
 };
 
-/**
- * struct ndp_cfg - ndp configuration
- * @tag: unique identifier
- * @ndp_cfg_len: ndp configuration length
- * @ndp_cfg: variable length ndp configuration
- *
- */
-struct ndp_cfg {
-	uint32_t tag;
-	uint32_t ndp_cfg_len;
-	uint8_t *ndp_cfg;
-};
-
-/**
- * struct ndp_qos_cfg - ndp qos configuration
- * @tag: unique identifier
- * @ndp_qos_cfg_len: ndp qos configuration length
- * @ndp_qos_cfg: variable length ndp qos configuration
- *
- */
-struct ndp_qos_cfg {
-	uint32_t tag;
-	uint32_t ndp_qos_cfg_len;
-	uint8_t ndp_qos_cfg[];
-};
-
-/**
- * struct ndp_app_info - application info shared during ndp setup
- * @tag: unique identifier
- * @ndp_app_info_len: ndp app info length
- * @ndp_app_info: variable length application information
- *
- */
-struct ndp_app_info {
-	uint32_t tag;
-	uint32_t ndp_app_info_len;
-	uint8_t *ndp_app_info;
-};
-
-/**
- * struct ndp_scid - structure to hold sceurity context identifier
- * @scid_len: length of scid
- * @scid: scid
- *
- */
-struct ndp_scid {
-	uint32_t scid_len;
-	uint8_t *scid;
-};
-
-/**
- * struct ndp_pmk - structure to hold pairwise master key
- * @pmk_len: length of pairwise master key
- * @pmk: buffer containing pairwise master key
- *
- */
-struct ndp_pmk {
-	uint32_t pmk_len;
-	uint8_t *pmk;
-};
-
 /**
  * struct ndi_create_rsp - ndi create response params
  * @status: request status
@@ -4280,157 +4181,6 @@ struct ndi_delete_rsp {
 	uint32_t reason;
 };
 
-/**
- * struct ndp_initiator_req - ndp initiator request params
- * @transaction_id: unique identifier
- * @vdev_id: session id of the interface over which ndp is being created
- * @channel: suggested channel for ndp creation
- * @channel_cfg: channel config, 0=no channel, 1=optional, 2=mandatory
- * @service_instance_id: Service identifier
- * @peer_discovery_mac_addr: Peer's discovery mac address
- * @self_ndi_mac_addr: self NDI mac address
- * @ndp_config: ndp configuration params
- * @ndp_info: ndp application info
- * @ncs_sk_type: indicates NCS_SK_128 or NCS_SK_256
- * @pmk: pairwise master key
- *
- */
-struct ndp_initiator_req {
-	uint32_t transaction_id;
-	uint32_t vdev_id;
-	uint32_t channel;
-	uint32_t channel_cfg;
-	uint32_t service_instance_id;
-	struct qdf_mac_addr peer_discovery_mac_addr;
-	struct qdf_mac_addr self_ndi_mac_addr;
-	struct ndp_cfg ndp_config;
-	struct ndp_app_info ndp_info;
-	uint32_t ncs_sk_type;
-	struct ndp_pmk pmk;
-};
-
-/**
- * struct ndp_initiator_rsp - response event from FW
- * @transaction_id: unique identifier
- * @vdev_id: session id of the interface over which ndp is being created
- * @ndp_instance_id: locally created NDP instance ID
- * @status: status of the ndp request
- * @reason: reason for failure if any
- *
- */
-struct ndp_initiator_rsp {
-	uint32_t transaction_id;
-	uint32_t vdev_id;
-	uint32_t ndp_instance_id;
-	uint32_t status;
-	uint32_t reason;
-};
-
-/**
- * struct ndp_indication_event - create ndp indication on the responder
- * @vdev_id: session id of the interface over which ndp is being created
- * @service_instance_id: Service identifier
- * @peer_discovery_mac_addr: Peer's discovery mac address
- * @peer_mac_addr: Peer's NDI mac address
- * @ndp_initiator_mac_addr: NDI mac address of the peer initiating NDP
- * @ndp_instance_id: locally created NDP instance ID
- * @role: self role for NDP
- * @ndp_accept_policy: accept policy configured by the upper layer
- * @ndp_config: ndp configuration params
- * @ndp_info: ndp application info
- * @ncs_sk_type: indicates NCS_SK_128 or NCS_SK_256
- * @scid: security context identifier
- *
- */
-struct ndp_indication_event {
-	uint32_t vdev_id;
-	uint32_t service_instance_id;
-	struct qdf_mac_addr peer_discovery_mac_addr;
-	struct qdf_mac_addr peer_mac_addr;
-	uint32_t ndp_instance_id;
-	enum ndp_self_role role;
-	enum ndp_accept_policy policy;
-	struct ndp_cfg ndp_config;
-	struct ndp_app_info ndp_info;
-	uint32_t ncs_sk_type;
-	struct ndp_scid scid;
-};
-
-/**
- * struct ndp_responder_req - responder's response to ndp create request
- * @transaction_id: unique identifier
- * @vdev_id: session id of the interface over which ndp is being created
- * @ndp_instance_id: locally created NDP instance ID
- * @ndp_rsp: response to the ndp create request
- * @ndp_config: ndp configuration params
- * @ndp_info: ndp application info
- * @pmk: pairwise master key
- * @ncs_sk_type: indicates NCS_SK_128 or NCS_SK_256
- *
- */
-struct ndp_responder_req {
-	uint32_t transaction_id;
-	uint32_t vdev_id;
-	uint32_t ndp_instance_id;
-	enum ndp_response_code ndp_rsp;
-	struct ndp_cfg ndp_config;
-	struct ndp_app_info ndp_info;
-	struct ndp_pmk pmk;
-	uint32_t ncs_sk_type;
-};
-
-/**
- * struct ndp_responder_rsp_event - response to responder's request
- * @transaction_id: unique identifier
- * @vdev_id: session id of the interface over which ndp is being created
- * @status: command status
- * @reason: reason for failure if any
- * @peer_mac_addr: Peer's mac address
- * @create_peer: Flag to indicate to create peer
- */
-struct ndp_responder_rsp_event {
-	uint32_t transaction_id;
-	uint32_t vdev_id;
-	uint32_t status;
-	uint32_t reason;
-	struct qdf_mac_addr peer_mac_addr;
-	bool create_peer;
-};
-
-/**
- * struct ndp_confirm_event - ndp confirmation event from FW
- * @vdev_id: session id of the interface over which ndp is being created
- * @ndp_instance_id: ndp instance id for which confirm is being generated
- * @reason_code : reason code(opaque to driver)
- * @num_active_ndps_on_peer: number of ndp instances on peer
- * @peer_ndi_mac_addr: peer NDI mac address
- * @rsp_code: ndp response code
- * @ndp_info: ndp application info
- *
- */
-struct ndp_confirm_event {
-	uint32_t vdev_id;
-	uint32_t ndp_instance_id;
-	uint32_t reason_code;
-	uint32_t num_active_ndps_on_peer;
-	struct qdf_mac_addr peer_ndi_mac_addr;
-	enum ndp_response_code rsp_code;
-	struct ndp_app_info ndp_info;
-};
-
-/**
- * struct ndp_end_req - ndp end request
- * @transaction_id: unique transaction identifier
- * @num_ndp_instances: number of ndp instances to be terminated
- * @ndp_ids: pointer to array of ndp_instance_id to be terminated
- *
- */
-struct ndp_end_req {
-	uint32_t transaction_id;
-	uint32_t num_ndp_instances;
-	uint32_t *ndp_ids;
-};
-
 /**
  * struct peer_ndp_map  - mapping of NDP instances to peer to VDEV
  * @vdev_id: session id of the interface over which ndp is being created
@@ -4450,76 +4200,6 @@ struct peer_ndp_map {
 	uint32_t ndp_instance_id;
 };
 
-/**
- * struct ndp_end_rsp_event  - firmware response to ndp end request
- * @transaction_id: unique identifier for the request
- * @status: status of operation
- * @reason: reason(opaque to host driver)
- *
- */
-struct ndp_end_rsp_event {
-	uint32_t transaction_id;
-	uint32_t status;
-	uint32_t reason;
-};
-
-/**
- * struct ndp_end_indication_event - ndp termination notification from FW
- * @num_ndp_ids: number of NDP ids
- * @ndp_map: mapping of NDP instances to peer and vdev
- *
- */
-struct ndp_end_indication_event {
-	uint32_t num_ndp_ids;
-	struct peer_ndp_map ndp_map[];
-};
-
-/**
- * struct ndp_schedule_update_req - ndp schedule update request
- * @transaction_id: unique identifier
- * @vdev_id: session id of the interface over which ndp is being created
- * @ndp_instance_id: ndp instance id for which schedule update is requested
- * @ndp_qos: new set of qos parameters
- *
- */
-struct ndp_schedule_update_req {
-	uint32_t transaction_id;
-	uint32_t vdev_id;
-	uint32_t ndp_instance_id;
-	struct ndp_qos_cfg ndp_qos;
-};
-
-/**
- * struct ndp_schedule_update_rsp - ndp schedule update response
- * @transaction_id: unique identifier
- * @vdev_id: session id of the interface over which ndp is being created
- * @status: status of the request
- * @reason: reason code for failure if any
- *
- */
-struct ndp_schedule_update_rsp {
-	uint32_t transaction_id;
-	uint32_t vdev_id;
-	uint32_t status;
-	uint32_t reason;
-};
-
-/**
- * struct sme_ndp_peer_ind - ndp peer indication
- * @msg_type: message id
- * @msg_len: message length
- * @session_id: session id
- * @peer_mac_addr: peer mac address
- * @sta_id: station id
- *
- */
-struct sme_ndp_peer_ind {
-	uint16_t msg_type;
-	uint16_t msg_len;
-	uint8_t session_id;
-	struct qdf_mac_addr peer_mac_addr;
-	uint16_t sta_id;
-};
 #endif /* WLAN_FEATURE_NAN */
 
 /**