Merge pull request #163 from cloudswei/ctlframe_injection

Packet injection bug fixing

diff --git a/Makefile b/Makefile
index 45a05e0e052ac7ac6e88ffb61a88f3f1a7f83758..de1e0f49e80cbc2386279f93400160ce3d241fd7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,11 +4,11 @@ GMP_TAR=gmp-$(GMP_VER).tar.bz2
 GMP_DIR=gmp-$(GMP_VER)
 GMP_SUM=f51c99cb114deb21a60075ffb494c1a210eb9d7cb729ed042ddb7de9534451ea
 
-MPFR_VER=4.0.2
+MPFR_VER=4.1.0
 MPFR_URL=https://ftp.gnu.org/gnu/mpfr/mpfr-$(MPFR_VER).tar.bz2
 MPFR_TAR=mpfr-$(MPFR_VER).tar.bz2
 MPFR_DIR=mpfr-$(MPFR_VER)
-MPFR_SUM=c05e3f02d09e0e9019384cdd58e0f19c64e6db1fd6f5ecf77b4b1c61ca253acc
+MPFR_SUM=feced2d430dd5a97805fa289fed3fc8ff2b094c02d05287fd6133e7f1f0ec926
 
 MPC_VER=1.1.0
 MPC_URL=https://ftp.gnu.org/gnu/mpc/mpc-$(MPC_VER).tar.gz
@@ -16,19 +16,19 @@ MPC_TAR=mpc-$(MPC_VER).tar.gz
 MPC_DIR=mpc-$(MPC_VER)
 MPC_SUM=6985c538143c1208dcb1ac42cedad6ff52e267b47e5f970183a3e75125b43c2e
 
-BINUTILS_VER=2.34
+BINUTILS_VER=2.35
 BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/binutils-$(BINUTILS_VER).tar.bz2
 BINUTILS_TAR=binutils-$(BINUTILS_VER).tar.bz2
 BINUTILS_DIR=binutils-$(BINUTILS_VER)
 BINUTILS_PATCHES=local/patches/binutils-2.34_fixup.patch local/patches/binutils.patch
-BINUTILS_SUM=89f010078b6cf69c23c27897d686055ab89b198dddf819efb0a4f2c38a0b36e6
+BINUTILS_SUM=7d24660f87093670738e58bcc7b7b06f121c0fcb0ca8fc44368d675a5ef9cff7
 
-GCC_VER=9.2.0
+GCC_VER=10.2.0
 GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-$(GCC_VER)/gcc-$(GCC_VER).tar.gz
 GCC_TAR=gcc-$(GCC_VER).tar.gz
 GCC_DIR=gcc-$(GCC_VER)
 GCC_PATCHES=local/patches/gcc.patch
-GCC_SUM=a931a750d6feadacbeecb321d73925cd5ebb6dfa7eff0802984af3aef63759f4
+GCC_SUM=27e879dccc639cd7b0cc08ed575c1669492579529b53c9ff27b0b96265fa867d
 
 BASEDIR=$(shell pwd)
 TOOLCHAIN_DIR=$(BASEDIR)/toolchain

diff --git a/NOTICE.TXT b/NOTICE.TXT
index 7ab5e318267a41dc39d1877fbdcbad0774a08968..a8bf00e9ffcfc0287fad10003062efaa0f1c8ab5 100644 (file)
--- a/NOTICE.TXT
+++ b/NOTICE.TXT
@@ -12,7 +12,7 @@ property.
 
 Copyright (c) 2013 QUALCOMM ATHEROS Incorporated.  All rights reserved.
 
-QUALCOMM ATHEROS® is a registered trademark and registered service mark of
+QUALCOMM ATHEROS® is a registered trademark and registered service mark of
 QUALCOMM ATHEROS Incorporated.  All other trademarks and service marks are
 the property of their respective owners.
 

diff --git a/target_firmware/magpie_fw_dev/target/init/app_start.c b/target_firmware/magpie_fw_dev/target/init/app_start.c
index 8fa9c8b56728b08adfd9e6c07950977f3d329ac9..754586390170fe4ca9f54af057913d824c499748 100644 (file)
--- a/target_firmware/magpie_fw_dev/target/init/app_start.c
+++ b/target_firmware/magpie_fw_dev/target/init/app_start.c
@@ -52,6 +52,8 @@
 #define ALLOCRAM_START       ( ((unsigned int)&_fw_image_end) + 4)
 #define ALLOCRAM_SIZE        ( SYS_RAM_SZIE - ( ALLOCRAM_START - SYS_D_RAM_REGION_0_BASE) - SYS_D_RAM_STACK_SIZE)
 
+void (* _assfail_ori)(struct register_dump_s *);
+
 // support for more than 64 bytes on command pipe
 extern void usb_reg_out_patch(void);
 extern int _HIFusb_get_max_msg_len_patch(hif_handle_t handle, int pipe);

diff --git a/target_firmware/magpie_fw_dev/target/init/init.h b/target_firmware/magpie_fw_dev/target/init/init.h
index 342f64b788e2aba94593ccd7866adf477894eb0a..e44c99e8abf803f5f329f22a39366edd410e9903 100644 (file)
--- a/target_firmware/magpie_fw_dev/target/init/init.h
+++ b/target_firmware/magpie_fw_dev/target/init/init.h
@@ -46,7 +46,7 @@
 void AR6002_fatal_exception_handler_patch(CPU_exception_frame_t *exc_frame);
 void exception_reset(struct register_dump_s *dump);
 
-void (* _assfail_ori)(struct register_dump_s *);
+extern void (* _assfail_ori)(struct register_dump_s *);
 void HTCMsgRecvHandler_patch(adf_nbuf_t hdr_buf, adf_nbuf_t buffer, void *context);
 void HTCControlSvcProcessMsg_patch(HTC_ENDPOINT_ID EndpointID, adf_nbuf_t hdr_buf,
                                   adf_nbuf_t pBuffers, void *arg);

diff --git a/target_firmware/wlan/if_llc.h b/target_firmware/wlan/if_llc.h
index 5fb1ba1cf835cb103053b9e9b86de2d59e086cf9..03476067bd1edc72624dd538d3f017ff59ae09d9 100755 (executable)
--- a/target_firmware/wlan/if_llc.h
+++ b/target_firmware/wlan/if_llc.h
@@ -50,10 +50,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.

diff --git a/target_firmware/wlan/if_owl.c b/target_firmware/wlan/if_owl.c
index 6dda78cef6b11c340fada4b4b900a118bed2ee50..919a4784f9e0c4339f751b7ff0666b0938cc4068 100755 (executable)
--- a/target_firmware/wlan/if_owl.c
+++ b/target_firmware/wlan/if_owl.c
@@ -1108,7 +1108,6 @@ ath_tgt_send_mgt(struct ath_softc_tgt *sc,adf_nbuf_t hdr_buf, adf_nbuf_t skb,
        hdrlen = ieee80211_anyhdrsize(wh);
        pktlen = len;
        keyix = HAL_TXKEYIX_INVALID;
-       pktlen -= (hdrlen & 3);
        pktlen += IEEE80211_CRC_LEN;
 
        if (iswep)
@@ -1142,6 +1141,8 @@ ath_tgt_send_mgt(struct ath_softc_tgt *sc,adf_nbuf_t hdr_buf, adf_nbuf_t skb,
                        atype = HAL_PKT_TYPE_NORMAL;
 
                break;
+       case IEEE80211_FC0_TYPE_CTL:
+               flags |= HAL_TXDESC_NOACK;
        default:
                atype = HAL_PKT_TYPE_NORMAL;
                break;