diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-01-05 09:00:53 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-01-05 09:00:53 -0800 |
| commit | ba944cd1dc25c1705e2d8714f11a2f4c8461f5aa (patch) | |
| tree | 1c366571ab0d3990ad31729ee3009107a89f6f6a | |
| parent | b5f0518296a9d2b9666cf2f467214856011f3ef6 (diff) | |
| parent | 03789eab012a2f228c7b0ed6811c67a223e1ac20 (diff) | |
Merge "Release 4.0.10.009 QCACLD WLAN Driver"
| -rw-r--r-- | CORE/MAC/inc/qwlan_version.h | 6 | ||||
| -rw-r--r-- | CORE/SERVICES/HIF/USB/hif_usb_internal.h | 2 | ||||
| -rw-r--r-- | CORE/SERVICES/HTC/htc.c | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/CORE/MAC/inc/qwlan_version.h b/CORE/MAC/inc/qwlan_version.h index de374e4db42f..69e22a08b685 100644 --- a/CORE/MAC/inc/qwlan_version.h +++ b/CORE/MAC/inc/qwlan_version.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2014 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -42,9 +42,9 @@ BRIEF DESCRIPTION: #define QWLAN_VERSION_MINOR 0 #define QWLAN_VERSION_PATCH 10 #define QWLAN_VERSION_EXTRA "" -#define QWLAN_VERSION_BUILD 007 +#define QWLAN_VERSION_BUILD 9 -#define QWLAN_VERSIONSTR "4.0.10.007A" +#define QWLAN_VERSIONSTR "4.0.10.9" #define AR6320_REV1_VERSION 0x5000000 diff --git a/CORE/SERVICES/HIF/USB/hif_usb_internal.h b/CORE/SERVICES/HIF/USB/hif_usb_internal.h index a01fd87d363c..9f27906e8921 100644 --- a/CORE/SERVICES/HIF/USB/hif_usb_internal.h +++ b/CORE/SERVICES/HIF/USB/hif_usb_internal.h @@ -41,7 +41,7 @@ #define TX_URB_COUNT 32 #define RX_URB_COUNT 32 -#define HIF_USB_RX_BUFFER_SIZE 2048 +#define HIF_USB_RX_BUFFER_SIZE (1792 + 8) #define HIF_USB_RX_BUNDLE_ONE_PKT_SIZE (1792 + 8) /* USB Endpoint definition */ diff --git a/CORE/SERVICES/HTC/htc.c b/CORE/SERVICES/HTC/htc.c index 8740f3007097..2ff489aa1af6 100644 --- a/CORE/SERVICES/HTC/htc.c +++ b/CORE/SERVICES/HTC/htc.c @@ -147,6 +147,9 @@ static void HTCCleanup(HTC_TARGET *target) if (target->hif_dev != NULL) { HIFDetachHTC(target->hif_dev); +#ifdef HIF_SDIO + HIFMaskInterrupt(target->hif_dev); +#endif target->hif_dev = NULL; } |