aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKalle Valo <kvalo@qca.qualcomm.com>2017-09-18 18:00:55 +0300
committerBen Hutchings <ben@decadent.org.uk>2017-10-09 17:44:30 +0100
commit96a7402d4172f4786ee93dd9f7cb3f76e1a8025e (patch)
treefd196dc97fa8716669d40c0fb687bbdb11398c04
parenta61ac5cf8374edbfe692d12f805a1b194f7fead2 (diff)
downloadfirmware-96a7402d4172f4786ee93dd9f7cb3f76e1a8025e.tar.gz
ath10k: QCA6174 hw3.0: update firmware-6.bin to WLAN.RM.4.4.1-00051-QCARMSWP-1
Update from a new firmware branch. This also fixes a regression with ath10k frequently disconnecting: http://lists.infradead.org/pipermail/ath10k/2017-August/010062.html Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
-rw-r--r--WHENCE2
-rw-r--r--ath10k/QCA6174/hw3.0/firmware-6.binbin711408 -> 727776 bytes
-rw-r--r--ath10k/QCA6174/hw3.0/notice_ath10k_firmware-6.txt97
3 files changed, 24 insertions, 75 deletions
diff --git a/WHENCE b/WHENCE
index 28cd63a1..869ef616 100644
--- a/WHENCE
+++ b/WHENCE
@@ -2699,7 +2699,7 @@ File: ath10k/QCA6174/hw3.0/firmware-4.bin
Version: WLAN.RM.2.0-00180-QCARMSWPZ-1
Licence: ath10k/QCA6174/hw3.0/notice_ath10k_firmware-4.txt
File: ath10k/QCA6174/hw3.0/firmware-6.bin
-Version: WLAN.RM.4.4-00022-QCARMSWPZ-2
+Version: WLAN.RM.4.4.1-00051-QCARMSWP-1
Licence: ath10k/QCA6174/hw3.0/notice_ath10k_firmware-6.txt
File: ath10k/QCA9377/hw1.0/board.bin
File: ath10k/QCA9377/hw1.0/board-2.bin
diff --git a/ath10k/QCA6174/hw3.0/firmware-6.bin b/ath10k/QCA6174/hw3.0/firmware-6.bin
index e1d312f7..a05b26ec 100644
--- a/ath10k/QCA6174/hw3.0/firmware-6.bin
+++ b/ath10k/QCA6174/hw3.0/firmware-6.bin
Binary files differ
diff --git a/ath10k/QCA6174/hw3.0/notice_ath10k_firmware-6.txt b/ath10k/QCA6174/hw3.0/notice_ath10k_firmware-6.txt
index 3e35786e..0ccec35f 100644
--- a/ath10k/QCA6174/hw3.0/notice_ath10k_firmware-6.txt
+++ b/ath10k/QCA6174/hw3.0/notice_ath10k_firmware-6.txt
@@ -1,40 +1,25 @@
-This Notice.txt file contains certain notices of software components included with the software that
-Qualcomm Atheros, Inc. ("Qualcomm Atheros") is required to provide you.
-Except where prohibited by the open source license, the content of this notices file is
-only provided to satisfy Qualcomm Atheros's attribution and notice requirement;
-your use of these software components together with the Qualcomm Atheros software
-(Qualcomm Atheros software hereinafter referred to as "Software") is subject to the
-terms of your license from Qualcomm Atheros. Compliance with all copyright laws and
-software license agreements included in the notice section of this file are
-the responsibility of the user. Except as may be granted by the separate license agreement applicable
-to this software (see LICENSE.QualcommAtheros_Ath10k), this file provides no license to any Qualcomm
-Atheros patents, trademarks, copyrights, or other intellectual property.
-Copyright (c) 2015 Qualcomm Atheros, Inc. All rights reserved.
-Qualcomm is a trademark of Qualcomm Incorporated, registered in the United States and other countries.
-All Qualcomm Incorporated trademarks are used with permission.
-Atheros is a trademark of Qualcomm Atheros, Inc., registered in the United States and other countries.
-Other products and brand names may be trademarks or registered trademarks of their respective owners.
-
-Copyright (c) 2015, Qualcomm Atheros, Inc.
-All rights reserved.
-Redistribution. Reproduction and redistribution in binary form, without modification, for use solely in conjunction with a Qualcomm Atheros, Inc. chipset, is permitted provided that the following conditions are met:
-· Redistributions must reproduce the above copyright notice and the following disclaimer in the documentation and/or other materials provided with the distribution.
-· Neither the name of Qualcomm Atheros, Inc. nor the names of its suppliers may be used to endorse or promote products derived from this Software without specific prior written permission.
-· No reverse engineering, decompilation, or disassembly of this Software is permitted.
-Limited patent license. Qualcomm Atheros, Inc. (“Licensor”) grants you (“Licensee”) a limited, worldwide, royalty-free, non-exclusive license under the Patents to make, have made, use, import, offer to sell and sell the Software. No hardware per se is licensed hereunder.
-The term “Patents” as used in this agreement means only those patents or patent applications owned solely and exclusively by Licensor as of the date of Licensor’s submission of the Software and any patents deriving priority (i.e., having a first effective filing date) therefrom. The term “Software” as used in this agreement means the firmware image submitted by Licensor, under the terms of this license, to git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git.
-Notwithstanding anything to the contrary herein, Licensor does not grant and Licensee does not receive, by virtue of this agreement or the Licensor’s submission of any Software, any license or other rights under any patent or patent application owned by any affiliate of Licensor or any other entity (other than Licensor), whether expressly, impliedly, by virtue of estoppel or exhaustion, or otherwise.
-DISCLAIMER. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
-CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
-TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+This Notice.txt file contains certain notices of software components
+included with the software that Qualcomm Atheros, Inc. (“Qualcomm Atheros”)
+is required to provide you. Except where prohibited by the open source
+license, the content of this notices file is only provided to satisfy
+Qualcomm Atheros's attribution and notice requirement; your use of these
+software components together with the Qualcomm Atheros software (Qualcomm
+Atheros software hereinafter referred to as “Software”) is subject to the
+terms of your agreement from Qualcomm Atheros. Compliance with all copyright
+laws and software license agreements included in the notice section of this
+file are the responsibility of the user. Except as may be granted by
+separate express written agreement, this file provides no license to any
+patents, trademarks, copyrights, or other intellectual property of Qualcomm
+Incorporated or any of its subsidiaries.
+
+Copyright (c) 2016 Qualcomm Atheros, Inc. All rights reserved.
+
+Qualcomm is a trademark of Qualcomm Incorporated, registered in the United
+States and other countries. All Qualcomm Incorporated trademarks are used
+with permission. Atheros is a trademark of Qualcomm Atheros, Inc.,
+registered in the United States and other countries. Other products and
+brand names may be trademarks or registered trademarks of their respective
+owners.
NOTICES:
@@ -1742,40 +1727,4 @@ p4://qctp411.qualcomm.com/components/src/wlanfw_protocol_cmn.cnss/3.0/src/suppli
* SUCH DAMAGE.
*/
-p4://qctp411.qualcomm.com/components/src/wlanfw_mac_core.cnss/6.0/patch/AR6320/v3/cmnos_printf_patch.c
-
-/*
- * Copyright 2015, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-p4://qctp411.qualcomm.com/components/src/wlanfw_protocol_cmn.cnss/3.0/src/offload/bpf.h
-
-/*
- * Copyright 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-p4://qctp411.qualcomm.com/components/src/wlanfw_protocol_cmn.cnss/3.0/src/offload/bpf_filter.c \ No newline at end of file
+p4://qctp411.qualcomm.com/components/src/wlanfw_mac_core.cnss/6.0/patch/AR6320/v3/cmnos_printf_patch.c \ No newline at end of file