Przeglądaj źródła

qcacmn: Update for check patch fixes

Fix for compilation errors after check patch fixes

Change-Id: Ib530d8d860440754f526ac93f5b12dbeab45b8aa
CRs-fixed: 2033001
Manikandan Mohan 8 lat temu
rodzic
commit
50ec704606

+ 4 - 4
dp/wifi3.0/dp_htt.c

@@ -1030,9 +1030,9 @@ static void dp_htt_t2h_msg_handler(void *context, HTC_PACKET *pkt)
  * @context:	Opaque context (HTT SOC handle)
  * @pkt:	HTC packet
  *
- * Return: HTC_SEND_FULL_ACTION
+ * Return: enum htc_send_full_action
  */
-static HTC_SEND_FULL_ACTION
+static enum htc_send_full_action
 dp_htt_h2t_full(void *context, HTC_PACKET *pkt)
 {
 	return HTC_SEND_FULL_KEEP;
@@ -1047,8 +1047,8 @@ dp_htt_h2t_full(void *context, HTC_PACKET *pkt)
 static int
 htt_htc_soc_attach(struct htt_soc *soc)
 {
-	HTC_SERVICE_CONNECT_REQ connect;
-	HTC_SERVICE_CONNECT_RESP response;
+	struct htc_service_connect_req connect;
+	struct htc_service_connect_resp response;
 	A_STATUS status;
 
 	qdf_mem_set(&connect, sizeof(connect), 0);

+ 2 - 1
utils/epping/inc/epping_internal.h

@@ -171,7 +171,8 @@ void epping_tx_complete_multiple(void *ctx, HTC_PACKET_QUEUE *pPacketQueue);
 int epping_tx_send(qdf_nbuf_t skb, epping_adapter_t *pAdapter);
 
 #ifdef HIF_SDIO
-HTC_SEND_FULL_ACTION epping_tx_queue_full(void *Context, HTC_PACKET *pPacket);
+enum htc_send_full_action epping_tx_queue_full(void *Context,
+						struct _HTC_PACKET *pPacket);
 #endif
 void epping_tx_dup_pkt(epping_adapter_t *pAdapter,
 		       HTC_ENDPOINT_ID eid, qdf_nbuf_t skb);

+ 2 - 2
utils/epping/src/epping_main.c

@@ -170,7 +170,7 @@ void epping_close(void)
 
 /**
  * epping_target_suspend_acknowledge() - process wow ack/nack from fw
- * @context: HTC_INIT_INFO->context
+ * @context: htc_init_info->context
  * @wow_nack: true when wow is rejected
  */
 static void epping_target_suspend_acknowledge(void *context, bool wow_nack)
@@ -219,7 +219,7 @@ int epping_enable(struct device *parent_dev)
 	epping_context_t *pEpping_ctx = NULL;
 	cds_context_type *p_cds_context = NULL;
 	qdf_device_t qdf_ctx;
-	HTC_INIT_INFO htcInfo;
+	struct htc_init_info htcInfo;
 	struct hif_opaque_softc *scn;
 	tSirMacAddr adapter_macAddr;
 	struct hif_target_info *tgt_info;

+ 2 - 1
utils/epping/src/epping_tx.c

@@ -305,7 +305,8 @@ tx_fail:
 }
 
 #ifdef HIF_SDIO
-HTC_SEND_FULL_ACTION epping_tx_queue_full(void *Context, HTC_PACKET *pPacket)
+enum htc_send_full_action epping_tx_queue_full(void *Context,
+						HTC_PACKET *pPacket)
 {
 	/*
 	 * Call netif_stop_queue frequently will impact the mboxping tx t-put.

+ 2 - 2
utils/epping/src/epping_txrx.c

@@ -402,8 +402,8 @@ epping_adapter_t *epping_add_adapter(epping_context_t *pEpping_ctx,
 int epping_connect_service(epping_context_t *pEpping_ctx)
 {
 	int status, i;
-	HTC_SERVICE_CONNECT_REQ connect;
-	HTC_SERVICE_CONNECT_RESP response;
+	struct htc_service_connect_req connect;
+	struct htc_service_connect_resp response;
 
 	qdf_mem_zero(&connect, sizeof(connect));
 	qdf_mem_zero(&response, sizeof(response));

+ 3 - 3
utils/pktlog/pktlog_ac.c

@@ -737,7 +737,7 @@ static void pktlog_h2t_send_complete(void *context, HTC_PACKET *htc_pkt)
  *
  * Return: HTC action
  */
-static HTC_SEND_FULL_ACTION pktlog_h2t_full(void *context, HTC_PACKET *pkt)
+static enum htc_send_full_action pktlog_h2t_full(void *context, HTC_PACKET *pkt)
 {
 	return HTC_SEND_FULL_KEEP;
 }
@@ -750,8 +750,8 @@ static HTC_SEND_FULL_ACTION pktlog_h2t_full(void *context, HTC_PACKET *pkt)
  */
 static int pktlog_htc_connect_service(struct ol_pktlog_dev_t *pdev)
 {
-	HTC_SERVICE_CONNECT_REQ connect;
-	HTC_SERVICE_CONNECT_RESP response;
+	struct htc_service_connect_req connect;
+	struct htc_service_connect_resp response;
 	A_STATUS status;
 
 	qdf_mem_set(&connect, sizeof(connect), 0);