Procházet zdrojové kódy

qcacld-3.0: Prune lim_send_probe_rsp_mgmt_frame() params

The lim_send_probe_rsp_mgmt_frame() parameters n_staid and keepalive
are not actually used, so remove them.

Change-Id: Iccaecb9abe336b0cad943b2c77944ff555d523cd
CRs-Fixed: 2414655
Jeff Johnson před 6 roky
rodič
revize
3c08ace019

+ 0 - 10
core/mac/src/include/dph_global.h

@@ -41,16 +41,6 @@
 #include "sir_mac_prot_def.h"
 #include "sir_api.h"
 
-/* Following determines whether statistics are maintained or not */
-#define DPH_STATS
-
-/* STAID for Management frames */
-#define DPH_USE_MGMT_STAID  -1
-
-/* Keep Alive frames */
-#define DPH_NON_KEEPALIVE_FRAME  0
-#define DPH_KEEPALIVE_FRAME      1
-
 /* DPH Hash Index for BSS(STA's Peer) on station. */
 #define DPH_STA_HASH_INDEX_PEER   1
 

+ 0 - 6
core/mac/src/pe/lim/lim_process_probe_req_frame.c

@@ -358,8 +358,6 @@ lim_process_probe_req_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_info,
 						(uint8_t) (ssid.length + 1))) {
 				lim_send_probe_rsp_mgmt_frame(mac_ctx,
 						mac_hdr->sa, &ssid,
-						DPH_USE_MGMT_STAID,
-						DPH_NON_KEEPALIVE_FRAME,
 						session,
 						probe_req.p2pIePresent);
 				return;
@@ -374,8 +372,6 @@ lim_process_probe_req_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_info,
 					lim_send_probe_rsp_mgmt_frame(mac_ctx,
 							mac_hdr->sa,
 							&ssid,
-							DPH_USE_MGMT_STAID,
-							DPH_NON_KEEPALIVE_FRAME,
 							session,
 							probe_req.p2pIePresent);
 					return;
@@ -401,8 +397,6 @@ lim_process_probe_req_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_info,
 				return;
 			lim_send_probe_rsp_mgmt_frame(mac_ctx, mac_hdr->sa,
 					&ssid,
-					DPH_USE_MGMT_STAID,
-					DPH_NON_KEEPALIVE_FRAME,
 					session,
 					probe_req.p2pIePresent);
 			return;

+ 2 - 19
core/mac/src/pe/lim/lim_send_management_frames.c

@@ -482,29 +482,12 @@ static QDF_STATUS lim_get_addn_ie_for_probe_resp(struct mac_context *mac,
 	return QDF_STATUS_SUCCESS;
 }
 
-/**
- * lim_send_probe_rsp_mgmt_frame() - Send probe response
- *
- * @mac_ctx: Handle for mac context
- * @peer_macaddr: Mac address of requesting peer
- * @ssid: SSID for response
- * @n_staid: Station ID, currently unused.
- * @pe_session: PE session id
- * @keepalive: Keep alive flag. Currently unused.
- * @preq_p2pie: P2P IE in incoming probe request
- *
- * Builds and sends probe response frame to the requesting peer
- *
- * Return: void
- */
-
 void
 lim_send_probe_rsp_mgmt_frame(struct mac_context *mac_ctx,
 			      tSirMacAddr peer_macaddr,
 			      tpAniSSID ssid,
-			      short n_staid,
-			      uint8_t keepalive,
-			      struct pe_session *pe_session, uint8_t preq_p2pie)
+			      struct pe_session *pe_session,
+			      uint8_t preq_p2pie)
 {
 	tDot11fProbeResponse *frm;
 	QDF_STATUS sir_status;

+ 20 - 2
core/mac/src/pe/lim/lim_types.h

@@ -451,8 +451,26 @@ void lim_populate_mac_header(struct mac_context *, uint8_t *, uint8_t, uint8_t,
 QDF_STATUS lim_send_probe_req_mgmt_frame(struct mac_context *, tSirMacSSid *,
 					    tSirMacAddr, uint8_t, tSirMacAddr,
 					    uint32_t, uint16_t *, uint8_t *);
-void lim_send_probe_rsp_mgmt_frame(struct mac_context *, tSirMacAddr, tpAniSSID, short,
-				   uint8_t, struct pe_session *, uint8_t);
+
+/**
+ * lim_send_probe_rsp_mgmt_frame() - Send probe response
+ * @mac_ctx: Handle for mac context
+ * @peer_macaddr: Mac address of requesting peer
+ * @ssid: SSID for response
+ * @pe_session: PE session id
+ * @preq_p2pie: P2P IE in incoming probe request
+ *
+ * Builds and sends probe response frame to the requesting peer
+ *
+ * Return: void
+ */
+void
+lim_send_probe_rsp_mgmt_frame(struct mac_context *mac_ctx,
+			      tSirMacAddr peer_macaddr,
+			      tpAniSSID ssid,
+			      struct pe_session *pe_session,
+			      uint8_t preq_p2pie);
+
 void lim_send_auth_mgmt_frame(struct mac_context *, tSirMacAuthFrameBody *, tSirMacAddr,
 			      uint8_t, struct pe_session *);
 void lim_send_assoc_req_mgmt_frame(struct mac_context *, tLimMlmAssocReq *, struct pe_session *);