From d56ce445fee8dd945fe55f01564b59e03cc98128 Mon Sep 17 00:00:00 2001
From: Zhang Jun Hao <zhangjunhao@espressif.com>
Date: Wed, 1 Aug 2018 12:28:48 +0800
Subject: [PATCH 1/2] feat(esp8266): make tx rate start from high to low

---
 components/esp8266/Kconfig           | 7 +++++++
 components/esp8266/source/esp_wifi.c | 8 ++++++++
 components/lwip/Kconfig              | 1 +
 3 files changed, 16 insertions(+)

diff --git a/components/esp8266/Kconfig b/components/esp8266/Kconfig
index 0ce6ee46..84cbd91f 100644
--- a/components/esp8266/Kconfig
+++ b/components/esp8266/Kconfig
@@ -49,6 +49,13 @@ config SCAN_AP_MAX
 
         User can use own function "esp_wifi_scan_get_ap_num_max" to determin how many AP to scan , too.
 
+config WIFI_TX_RATE_SEQUENCE_FROM_HIGH
+    bool "Set wifi tx rate from 54M to 1M"
+    default n
+    help
+        If this option is enabled, Wifi will try to send packets first from high rate(54M). If it fails, it will 
+        try at low rate until the transmission is successful.
+
 endmenu
 
 menu PHY
diff --git a/components/esp8266/source/esp_wifi.c b/components/esp8266/source/esp_wifi.c
index cb684e01..3433d801 100644
--- a/components/esp8266/source/esp_wifi.c
+++ b/components/esp8266/source/esp_wifi.c
@@ -56,3 +56,11 @@ size_t __attribute__((weak)) esp_wifi_scan_get_ap_num_max(void)
 {
     return CONFIG_SCAN_AP_MAX;
 }
+
+bool IRAM_ATTR esp_wifi_try_rate_from_high(void) {
+#if CONFIG_WIFI_TX_RATE_SEQUENCE_FROM_HIGH
+    return true;
+#else
+    return false;
+#endif
+}
\ No newline at end of file
diff --git a/components/lwip/Kconfig b/components/lwip/Kconfig
index ffdff57e..29903041 100644
--- a/components/lwip/Kconfig
+++ b/components/lwip/Kconfig
@@ -10,6 +10,7 @@ config LWIP_HIGH_THROUGHPUT
     select TCP_QUEUE_OOSEQ
     select TCP_HIGH_SPEED_RETRANSMISSION
     select SOC_FULL_ICACHE
+    select WIFI_TX_RATE_SEQUENCE_FROM_HIGH
     help
         Enable this option, also enable "TCP_QUEUE_OOSEQ", "TCP_HIGH_SPEED_RETRANSMISSION" and
         "SOC_FULL_ICACHE", so lwip should cache TCP message received in disorder sequence and

From 4facff26a1855ce2b6a6f7ea67a3f1a800348a65 Mon Sep 17 00:00:00 2001
From: Zhang Jun Hao <zhangjunhao@espressif.com>
Date: Wed, 1 Aug 2018 12:30:14 +0800
Subject: [PATCH 2/2] feat(lib): make tx rate start from high to low

---
 components/esp8266/lib/VERSION |   2 +-
 components/esp8266/lib/libpp.a | Bin 242660 -> 242796 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/esp8266/lib/VERSION b/components/esp8266/lib/VERSION
index 6a00e507..b0bb7eaf 100644
--- a/components/esp8266/lib/VERSION
+++ b/components/esp8266/lib/VERSION
@@ -3,7 +3,7 @@ gwen:
     espnow:     8943c89
     core:       f4f0d3d
     net80211:   80fc165
-    pp:         06e0988
+    pp:         09345a6
     pwm:        0181338
     smartconfig:8d61f0e
     wpa:        f59f0e0
diff --git a/components/esp8266/lib/libpp.a b/components/esp8266/lib/libpp.a
index 440ce256710386691e9a90117906b81dbc39c1b4..e5576de6952d339e78cbb7c60fbbea27e218a3c9 100644
GIT binary patch
delta 3768
zcmcgve{2**6rP#8D@XR)UTLK#1-jc(ezv7O1X_?t3TPFnNC44bjuu)<La8Z@N{sFw
zAOUHxWWj5yF_>Ve22Es90un4>kP?AH#2Q19A^}1gv4%urNY3}&zBR`g5@LW&Uf=h=
z_szW7x3ja?E7#Kcucx)<q)aL)pBygVX6!I)Hwy8ft#6YMcQNyBiHF3SLcZ(0|JKtg
z<UN^rufhkUGw*4Y_qVt@utK<Ix*+bm<_mQ$^uWxccZ(!5lZl5M&-u@a{?7ueH%DgM
zTfE^+ezBu{C)6;zH+z@gC5#@KZGWh5$xS3YbO=}<>El!=U^mZP?1?V>Q4O+A%^GR?
zUrt{q<&9XU5WUK{6q}JQuOoO}4ow|Y+8Z0_jdd1gjL#3Ji>8L`3Kh6;tXw{wAumBx
zCXJq0Wk#ni%2nz4Slm<YXXIw6%8a7a7EfWO>_MEDE-qX)PQ}7`!svoDTqES!8l;X(
zA%r{w=={~s>F+72>&-qPTAGX_u{<TRYy6VN#nnZr@;kt~;d70zVn-D%{lc^I7%0Pz
zmD-rTOU0LC*w&%hp|nq9Wy;v?tWbVwU7o#Iy}i$xHfOZ*?X_#>T$cs&g%BIOLJTMG
zrMdy~_2h{XE$ln&#;0CTCZuw#5S1PpLRgV~PdJ}^9@$O8;QV9*gbT?d9)Y>&0uMZa
zJork&spK(sQGy0|5c5k3ha7B*W(v|du|8pdyM8QgC-GPi3LGPh9;5KLgfq#bSWm)O
zV3)r^7~`PtC!9?lv4{E~gy|&QCZSl66607@PS`Crjj(%{wei8uShuklyP9~N$D+}=
zP}prcG_AxxLL3(HacP36gD`FaqCJF1u&9f$+q!OF^l-l#77hHN{Lz`?l-J%mw@oUd
z+YOoLE2D`IS<lVO_jyx<sEBSGuQIK7<^|Q0DOPvUXjPwL1uqS?(u#w=og`?B8ivfY
zrW6O|Ei1EXjIWI9EVZ7f%1`}CCq%2kqX|R@3RRBWZhcccW^iX3JrCLlLF;C5u5Z~8
zA<o;sRP9zi?4aq^mglFMgK=wo1<5~}6i-Nsr%{YYyqvT{gip+)7*Aml$4ip*4N37^
z6uX_L@fBiolHh%c-L|8^CrSCk6r<y#xZp{9?Sk7fr*`ctk=It$t%@`^t&22OH`hk$
zni?A-^{ZCaTWc0}7hu;&yjyg&(E24$yD0&0u$M2Q*X&hlP8RK?zeuu?@omDJ84L0q
zjJ@RdGWL`2VH_ae%NUw|#($F6s3hhO5+265fc#ho(>A9>87DA!I%5>TJBz_tgcmS=
zk$g2{6s}{8v7L;&$ipxeuj>zt|0aKhF?w;$OYaRtw<s9k1R6Gi8VDYZoWgjP{p*q(
zkGYcSAcZq0L?*{OeO|*nIAD$W;n3tdnm1Sj4p?J;J@aT-JL7}obux)pn=Wi^s%yqc
z1R5tsL4?zfu0xJUfCJW;Kfyc>(6MB)$k8Ll&42^em_N@v7F0+kiyi${4?Qpp0C|;6
z<3tHW6CDvc0}VJ}jrqr*8Rcj&F*M-f+k|<XGvKqxrvT$Prfaavn*=gA!0}#&Nedhi
z24OHbV2%05p&9LHa#;foSYsZ05@VammoUcmn~Aa9=`h76L?98kkD!VN;9CNN24_@+
zF(#djiMU&9m<I>!cJT}5@tN4i7@v|>GD*i9U8Xq536Q{=lMu(5$HBIpu)FC_GY<~f
z-E=5|h2q=OM#criMdrZ)yYv4R=jr*Qzy}n#1#ZO?4hQTODB%|e-zQkSbL9PGGK`xM
z;u+?_0c*?$pqb=o7P1E1LK7lR-~%ToJ0kEX04}a!z6F}8j;4(@;D9yeJD@3dH2YWs
z4p?LUF!QR*XZ?Qis{Q#g>5ca8@&v4}SIjDyk9P1OySkxzd2!=J-MvaDPjdc0j8^NO
zkUg<BZC&E8M*F3U2h<%zNnhl%L}LG*t+KI_nf>(B^K{=G>A(SXCf!ZbPt~LU{!FDH
RwExIi)n4VMX$kACe*muQnFRm<

delta 3551
zcmcguYitx%6ux(Mx3rnIy9Hz$sdTq5UTtAZsjWd%gvJt}5dxwHBM<QhN=itBCBcj+
z8WT_<11vv~fEqN&D@;mTFmVF`c|@QPfk0`f8ihy#8jbt_*YDdo6E-y@!~i!rIp6)x
zckj9P%$+-P{c7&dzviwPoKZElE><^oZFIf$+CNG?Z0l7@-NUSV1s)M^DgE*C2XE&y
zmA)^t?pOGbbk=>X^1&uII=Yo-mIqS)=uu^Kt$AqXi!`b}X7wc=alhd|EBZeRu-_gM
zc2@bT2FQyYkDW2{olD_unL^lGd&AD=$g0A$zQ1lvZLQrC9%kG!otF9+eD=u+QLEo8
z!DU+imP{yh*@*TgpAPD4?6m4ZIT^8@<nKMnM0wtb;;NupvMBtlk==c$E^m_7y%g2v
zMK2^9bt0nbjM%wk%2(uM`}9Rdi-M~AV6-b)YeY}FG5rJiBU&k?&l2kCDHk~t*<k2M
zq$Qx#>Lt-5$s$9A=Vj{eMP8AkPY}LdFgbc4dC<U8yQk>yNJTr6u@26D%t)n=cG#yU
z=I8Ea)*X_yGd}m49$;rROfU|&*-Z^)MuX!lZMdpSr(h+E{Yn+U--OSGpMgaHs#fvq
zocEraWmuHzVM<N(DHR7cV3&aDGhvs3%Z1P4cr^0FBjKs52F`&mf{jnp5cd<l5jbD)
z9N?gfE!CVhz*{pHv>JRdL`<+7nAK(CJ-`Ftne0&7SYnSq2h4HQUjPonvwtH^@7Bd~
zcYhm!;UX$UfxKj8z}_yW0kd&Zub5oui{K;Rn1ID)qsA*VHOs+229BDwX_|FR#zj%I
z5%>uawE=sj`z8?IGt2jQJTctJc6LqPs0}ccU+JR2^?|69-8{88a1;7x<13;#58J1P
zjH(R#bVZplBf}2G2idump}^`4B#3uWP*WMwt@fCvp@9;lc;0@ssW@kL1PBY^W66%M
zE!Kl|i~Vio(5x-FO0B^e2-!C(3j?G3E7j>Fo4zyxJTN2euctjZ{tl}pEd(FrE~T+Q
z1bsfu`M~{EK*i8!!DmW;Ts&{5E}S+Gv{y^Y7WJ9NLf@++;~({je}+CwSR&Kzaz3Aa
zTiXX_oGRtB)_e)jT8U+7OB!D6?4F7DVF|W15F5G$$-9DY1HUg=!G9sx55G%rCj4Q+
z+3?2&Q*%M^Pw;;W4#8(2J#*#JyBOyYff5OD@KC`_z!!}J1_D1LxB-5uU?!d}m}7Sc
zZiA<B>|*$Y;9uZR3uZ0O`f=DPx`NJS39w*Us4ICEvPkeKXVgoBeWmk}hap}R`7k}g
zt@A?R$t|>-XNM=fB}@T4v03OUE#X<74TAT<M_`(7AKE72$!)Sv%??}pg(-n2HhD{-
z9TJ|i4TI?lmp>ysIbu`za%w7F4fnvkkRvvQA5Be(tKq!RSc)V&rUb6Lfz<o_2QjZZ
zw7=5$JA!$8Rs-u&SHnAiiOCV0!q-w$=4wpQkTd-_D5eBb#|MMwKv3XK1V4_0rG7(%
zCr4}w|CI2&s%cyVuj<KyIcGiRk!rmxd_5l;J6;(-l>o2dErR#JFNbN|A#B@(Cr4}w
zzgKu(7ViLSIT-teCr9iZ80N6JQr_(=VP1mcz~sphdkHQI&jcR=dkL-xPmb72P#{N~
z*FTMOmc#$au`zB1&%Z_jB#BKopl(rAl@h6X(U2oHh3EG}SG$@wL_?0)6rSG?UE^w2
ziiRAqStFu#6xF(-Eg~XEYzn_!__jbix63HAH=js2Bj#$qHtg~RP4)*1y#KA#@72Bq
z!DVT`SI&<;ord(Ct-VWkrp4N;Khe#N=|tkZZtuNI<hQTyG)@MENd3;WuQ+CG_x|VF
R@q@Rw>8?J!FY0^K{ufXiRlWcK