Merge "Release 1.0.0.192 QCACLD WLAN Driver"

6 files changed, 26 insertions, 11 deletions

diff --git a/CORE/CLD_TXRX/HTT/htt_rx.c b/CORE/CLD_TXRX/HTT/htt_rx.c
index a16f838bbaac..ab8af1642749 100644
--- a/CORE/CLD_TXRX/HTT/htt_rx.c
+++ b/CORE/CLD_TXRX/HTT/htt_rx.c
@@ -2377,7 +2377,9 @@ htt_rx_attach(struct htt_pdev_t *pdev)
         pdev->rx_ring.fill_level = htt_rx_ring_fill_level(pdev);
 
         if (pdev->cfg.is_full_reorder_offload) {
-            htt_rx_hash_init(pdev);
+            if (htt_rx_hash_init(pdev)) {
+                goto fail1;
+            }
 
             /* allocate the target index */
             pdev->rx_ring.target_idx.vaddr = adf_os_mem_alloc_consistent(
diff --git a/CORE/HDD/src/wlan_hdd_ipa.c b/CORE/HDD/src/wlan_hdd_ipa.c
index 42f45d8f1d8c..2f37f3c257d9 100644
--- a/CORE/HDD/src/wlan_hdd_ipa.c
+++ b/CORE/HDD/src/wlan_hdd_ipa.c
@@ -2413,7 +2413,14 @@ static int hdd_ipa_add_header_info(struct hdd_ipa_priv *hdd_ipa,
 		snprintf(ipa_hdr->hdr[0].name, IPA_RESOURCE_NAME_MAX, "%s%s",
 				ifname, HDD_IPA_IPV6_NAME_EXT);
 
-		if (!hdd_ipa_uc_is_enabled(hdd_ipa)) {
+#ifdef IPA_UC_OFFLOAD
+		if (hdd_ipa_uc_is_enabled(hdd_ipa)) {
+			/* Set the type to IPV6 in the header*/
+			uc_tx_hdr = (struct hdd_ipa_uc_tx_hdr *)ipa_hdr->hdr[0].hdr;
+			uc_tx_hdr->eth.h_proto = cpu_to_be16(ETH_P_IPV6);
+		} else
+#endif /* IPA_UC_OFFLOAD */
+		{
 			/* Set the type to IPV6 in the header*/
 			tx_hdr = (struct hdd_ipa_tx_hdr *)ipa_hdr->hdr[0].hdr;
 			tx_hdr->llc_snap.eth_type = cpu_to_be16(ETH_P_IPV6);
diff --git a/CORE/MAC/inc/qwlan_version.h b/CORE/MAC/inc/qwlan_version.h
index 67f7a55f412e..30f366177c20 100644
--- a/CORE/MAC/inc/qwlan_version.h
+++ b/CORE/MAC/inc/qwlan_version.h
@@ -42,9 +42,9 @@ BRIEF DESCRIPTION:
 #define QWLAN_VERSION_MINOR            0
 #define QWLAN_VERSION_PATCH            0
 #define QWLAN_VERSION_EXTRA            ""
-#define QWLAN_VERSION_BUILD            191
+#define QWLAN_VERSION_BUILD            192
 
-#define QWLAN_VERSIONSTR               "1.0.0.191"
+#define QWLAN_VERSIONSTR               "1.0.0.192"
 
 
 #define AR6320_REV1_VERSION             0x5000000
diff --git a/CORE/MAC/src/pe/lim/limProcessAssocReqFrame.c b/CORE/MAC/src/pe/lim/limProcessAssocReqFrame.c
index ff32f51d8eb7..35c04d2beb48 100644
--- a/CORE/MAC/src/pe/lim/limProcessAssocReqFrame.c
+++ b/CORE/MAC/src/pe/lim/limProcessAssocReqFrame.c
@@ -178,9 +178,9 @@ void lim_check_sta_in_pe_entries(tpAniSirGlobal pMac, tpSirMacMgmtHdr pHdr)
 
     for(i = 0; i < pMac->lim.maxBssId; i++)
     {
-        if( (pMac->lim.gpSession[i].valid) &&
-            (pMac->lim.gpSession[i].pePersona == VOS_STA_SAP_MODE) &&
-            ((psessionEntry = &pMac->lim.gpSession[i]) != NULL)) {
+        if( ((psessionEntry = &pMac->lim.gpSession[i]) != NULL) &&
+            (pMac->lim.gpSession[i].valid) &&
+            (pMac->lim.gpSession[i].pePersona == VOS_STA_SAP_MODE) ) {
 
             pStaDs = dphLookupHashEntry(pMac, pHdr->sa, &assocId,
                             &psessionEntry->dph.dphHashTable);
diff --git a/CORE/SERVICES/HIF/USB/if_usb.c b/CORE/SERVICES/HIF/USB/if_usb.c
index 486d2ae7f9d6..e747850ed02b 100644
--- a/CORE/SERVICES/HIF/USB/if_usb.c
+++ b/CORE/SERVICES/HIF/USB/if_usb.c
@@ -292,6 +292,7 @@ static int hif_usb_suspend(struct usb_interface *interface, pm_message_t state)
 	void *vos = vos_get_global_context(VOS_MODULE_ID_HIF, NULL);
 	v_VOID_t * temp_module;
 
+	printk("Enter:%s,Line:%d \n\r", __func__,__LINE__);
 	if (vos == NULL)
 		return 0;
 	/* No need to send WMI_PDEV_SUSPEND_CMDID to FW if WOW is enabled */
@@ -322,6 +323,7 @@ static int hif_usb_suspend(struct usb_interface *interface, pm_message_t state)
 		}
 	}
 	usb_hif_flush_all(device);
+	printk("Exit:%s,Line:%d \n\r", __func__,__LINE__);
 	return 0;
 }
 
@@ -336,6 +338,7 @@ static int hif_usb_resume(struct usb_interface *interface)
 	void *vos = vos_get_global_context(VOS_MODULE_ID_HIF, NULL);
 	v_VOID_t * temp_module;
 
+	printk("Enter:%s,Line:%d \n\r", __func__,__LINE__);
 	if (vos == NULL)
 		return 0;
 	/* No need to send WMI_PDEV_SUSPEND_CMDID to FW if WOW is enabled */
@@ -360,9 +363,10 @@ static int hif_usb_resume(struct usb_interface *interface)
 	if (!wma_is_wow_mode_selected(temp_module)) {
 		wma_resume_target(temp_module);
 	} else if (wma_disable_wow_in_fw(temp_module)) {
-	    return (-1);
+		pr_warn("%s[%d]: fail\n", __func__, __LINE__);
+		return (-1);
 	}
-
+	printk("Exit:%s,Line:%d \n\r", __func__,__LINE__);
 	return 0;
 }
 
@@ -371,8 +375,9 @@ static int hif_usb_reset_resume(struct usb_interface *intf)
 	HIF_DEVICE_USB *device = usb_get_intfdata(intf);
 	struct hif_usb_softc *sc = device->sc;
 
+	printk("Enter:%s,Line:%d \n\r", __func__,__LINE__);
 	HIFDiagWriteCOLDRESET(sc->hif_device);
-
+	printk("Exit:%s,Line:%d \n\r", __func__,__LINE__);
 	return 0;
 }
 
diff --git a/CORE/SERVICES/HIF/USB/usbdrv.c b/CORE/SERVICES/HIF/USB/usbdrv.c
index 453739ddddd6..9de7c4ea5eeb 100644
--- a/CORE/SERVICES/HIF/USB/usbdrv.c
+++ b/CORE/SERVICES/HIF/USB/usbdrv.c
@@ -856,7 +856,7 @@ void usb_hif_start_recv_pipes(HIF_DEVICE_USB *device)
 {
 	device->pipes[HIF_RX_DATA_PIPE].urb_cnt_thresh =
 	    device->pipes[HIF_RX_DATA_PIPE].urb_alloc / 2;
-
+	printk("Enter:%s,Line:%d \n\r", __func__,__LINE__);
 	if (!htc_bundle_recv) {
 		usb_hif_post_recv_transfers(&device->pipes[HIF_RX_DATA_PIPE],
 					    HIF_USB_RX_BUFFER_SIZE);
@@ -878,6 +878,7 @@ void usb_hif_start_recv_pipes(HIF_DEVICE_USB *device)
 	usb_hif_post_recv_transfers(&device->pipes[HIF_RX_INT_PIPE],
 				    HIF_USB_RX_BUFFER_SIZE);
 #endif
+	printk("Exit:%s,Line:%d \n\r", __func__,__LINE__);
 }
 
 A_STATUS usb_hif_submit_ctrl_out(HIF_DEVICE_USB *device,