[Feature][Modem]Merge MTK release P3 P4 patch

Change-Id: I1ef3d69e36378ee73a422ecb2721488d6b416427
diff --git a/mcu/interface/protocol/xcap/xcap_if.h b/mcu/interface/protocol/xcap/xcap_if.h
index 9fb4cb2..1b76b2d 100755
--- a/mcu/interface/protocol/xcap/xcap_if.h
+++ b/mcu/interface/protocol/xcap/xcap_if.h
@@ -53,6 +53,11 @@
  * ==========================================================================
  * $Log$
  *
+ * 08 11 2022 panu.peisa
+ * [MOLY00844196] [CR Review Excluded][SV Focus][Internal][MT6895][Pichon][S0][Pre-DCP][IMS][France][Orange][LiveNW][TCID: 59x.1.4.1.1.b] XCAP failures in flight mode + WFC
+ * 	
+ * XCAP IF.
+ *
  * 04 22 2022 jani.manninen
  * [MOLY00759459] [IMS][IMS-SS] TIM (VoLTE_IMS Smartphone and Tablet v2.2) - XCAP If-Match header support
  * 	
@@ -575,6 +580,12 @@
 
 typedef struct
 {
+    XCAP_LOCAL_PARA_STRUCT local_param;
+    kal_bool is_wfc_only_pdn;
+} HTTP_IND_ILM_STRUCT;
+
+typedef struct
+{
 #if defined(__HTTP_TLS_SUPPORT__)
     XCAP_LOCAL_PARA_STRUCT local_param;
 #else
@@ -682,7 +693,7 @@
 typedef HTTP_RSP_ILM_STRUCT xcap_http_delegate_send_http_rsp_struct; // MSG_ID_XCAP_HTTP_DELEGATE_SEND_HTTP_RSP
 typedef HTTP_REQ_ILM_STRUCT xcap_http_connection_send_http_req_struct; // MSG_ID_XCAP_HTTP_CONNECTION_SEND_HTTP_REQ
 typedef HTTP_RSP_ILM_STRUCT xcap_http_connection_send_http_rsp_struct; // MSG_ID_XCAP_HTTP_CONNECTION_SEND_HTTP_RSP
-typedef XCAP_LOCAL_PARA_STRUCT xcap_http_connection_pdn_on_ind_struct; // MSG_ID_XCAP_HTTP_CONNECTION_PDN_ON_IND
+typedef HTTP_IND_ILM_STRUCT xcap_http_connection_pdn_on_ind_struct; // MSG_ID_XCAP_HTTP_CONNECTION_PDN_ON_IND
 typedef XCAP_LOCAL_PARA_STRUCT xcap_http_connection_pdn_off_ind_struct; // MSG_ID_XCAP_HTTP_CONNECTION_PDN_OFF_IND
 typedef XCAP_LOCAL_PARA_STRUCT xcap_http_connection_force_abort_ind_struct; //MSG_ID_XCAP_HTTP_CONNECTION_FORCE_ABORT_IND
 typedef XCAP_LOCAL_PARA_STRUCT xcap_http_connection_force_abort_cnf_struct; //MSG_ID_XCAP_HTTP_CONNECTION_FORCE_ABORT_CNF