From f09ae075526f3a6ac816940d3d258922028c4165 Mon Sep 17 00:00:00 2001
From: ChenJianxing <chenjianxing@espressif.com>
Date: Tue, 23 Nov 2021 15:25:31 +0800
Subject: [PATCH] backport some wifi fix(eb522643) 1. modify Mexico channel
 range refer to FCC. 2. fix wrong allocation for coex funcs

---
 esp32/libcoexist.a       | Bin 110262 -> 110262 bytes
 esp32/libcore.a          | Bin 4556 -> 4556 bytes
 esp32/libespnow.a        | Bin 49026 -> 49026 bytes
 esp32/libmesh.a          | Bin 979260 -> 979260 bytes
 esp32/libnet80211.a      | Bin 1044514 -> 1044514 bytes
 esp32/libpp.a            | Bin 525732 -> 525732 bytes
 esp32/libsmartconfig.a   | Bin 186138 -> 186138 bytes
 esp32/libwapi.a          | Bin 52690 -> 52690 bytes
 esp32c3/libcoexist.a     | Bin 69384 -> 69384 bytes
 esp32c3/libcore.a        | Bin 3972 -> 3972 bytes
 esp32c3/libespnow.a      | Bin 51638 -> 51638 bytes
 esp32c3/libmesh.a        | Bin 1007888 -> 1007888 bytes
 esp32c3/libnet80211.a    | Bin 912434 -> 912434 bytes
 esp32c3/libpp.a          | Bin 421808 -> 421808 bytes
 esp32c3/libsmartconfig.a | Bin 192002 -> 192002 bytes
 esp32c3/libwapi.a        | Bin 46094 -> 46094 bytes
 esp32s2/libcoexist.a     | Bin 67520 -> 67520 bytes
 esp32s2/libcore.a        | Bin 4540 -> 4540 bytes
 esp32s2/libespnow.a      | Bin 48818 -> 48818 bytes
 esp32s2/libmesh.a        | Bin 970432 -> 970432 bytes
 esp32s2/libnet80211.a    | Bin 1080540 -> 1080540 bytes
 esp32s2/libpp.a          | Bin 527356 -> 527356 bytes
 esp32s2/libsmartconfig.a | Bin 183662 -> 183662 bytes
 esp32s2/libwapi.a        | Bin 52382 -> 52382 bytes
 esp32s3/libcoexist.a     | Bin 80186 -> 80186 bytes
 esp32s3/libcore.a        | Bin 4820 -> 4820 bytes
 esp32s3/libespnow.a      | Bin 48966 -> 48966 bytes
 esp32s3/libmesh.a        | Bin 970752 -> 970752 bytes
 esp32s3/libnet80211.a    | Bin 1029628 -> 1029628 bytes
 esp32s3/libpp.a          | Bin 542896 -> 542896 bytes
 esp32s3/libsmartconfig.a | Bin 185110 -> 185110 bytes
 esp32s3/libwapi.a        | Bin 52358 -> 52358 bytes
 32 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/esp32/libcoexist.a b/esp32/libcoexist.a
index cec874b6efc39b3bf206c3d05951849963089471..3be20be1888b06c3ad3e046536a1563fc22fa247 100644
GIT binary patch
delta 30
mcmdmXmu=f!whb(@?5RnnMn+~PlMCg<o0Vj@E6FlWnFs)>FA3}b

delta 30
mcmdmXmu=f!whb(@?3SrUsfL!ulMCg<o0Vj@E6FlWnFs)>Gzs(o

diff --git a/esp32/libcore.a b/esp32/libcore.a
index 74a07e7083aa41ee40480bb659b348e6be51ea47..8d79a2d981bb9dfeabbc7d85c5f50565633d4cda 100644
GIT binary patch
delta 24
fcmX@3d`5XgAR~KflBtoAnaSjjJQ|xD7<~i)Yhefa

delta 24
fcmX@3d`5XgAS1hFs!^(;rSasCJQ|xD7<~i)YeonH

diff --git a/esp32/libespnow.a b/esp32/libespnow.a
index 9012c44b27da54a9b5b99fd2b7598d2fa73949cf..fcd09071c7f1194bc2cf438aa2a694018e996d68 100644
GIT binary patch
delta 22
dcmZqr&(!pvX+t9mduo!Yk&&6n<_?x$y8vj82><{9

delta 22
dcmZqr&(!pvX+t9myJf0Ts-dOv<_?x$y8viY2?ziH

diff --git a/esp32/libmesh.a b/esp32/libmesh.a
index b5af98316750b22ad0273b3e89966fe9232b830b..fc7e7c7835d970c59d581ea4b62db4dc46d374e9 100644
GIT binary patch
delta 87
zcmdn<$a>Es>kT!29H~jBMn+~P43i61s!aY+%h9~SuYH3bBM>tIF*6Xe05K~NvjH(X
Z5OV-AClGT1F*gwN05R|O4Ssw*ivTfNBV_;p

delta 87
zcmdn<$a>Es>kT!29G0m@sfL!u43i61s!aY+%h9~SuYH3bBM>tIF*6Xe05K~NvjH(X
Z5OV-AClGT1F*gwN05R|O4Ssw*ivTkxBW(Zx

diff --git a/esp32/libnet80211.a b/esp32/libnet80211.a
index 7f661afe09038325e5cf2e3dc4ecfbc054206459..f088dd240ece5dea47f5c3b9ed15e0768812a82b 100644
GIT binary patch
delta 114
zcmZ4Vz<$vK`-T?A7N#xCyJW;tlT3|_%uIBPQgic5QW>D!_6su1K+FQftlKZhu&q>M
vhsiWJv$Z!kvjZ^)5OZ#CaOP4iU}S7xwwVivxq+Amh<SmSZ~L;%{53WJ2remr

delta 114
zcmZ4Vz<$vK`-T?A7N#xCyJW;HQ;kv$Esb@HQgic5QW>D!_6su1K+FQftlKZhu&q>M
vhsiWJv$Z!kvjZ^)5OZ#CaOP4iU}SDzwwVivxq+Amh<SmSZ~L;%{53WJ4g)Eg

diff --git a/esp32/libpp.a b/esp32/libpp.a
index 77bbffefb14547c9a2545abefadfb81f62d2968c..5264a6acb919606a8b6cfc92d813e21fc2d34bc8 100644
GIT binary patch
delta 45
wcmZ3|t+1q9p`nGbg=q_OMk0G^lBtoAnMr$oA~O)P05K~Nvu)2$WH(&`0A|h)Pyhe`

delta 45
wcmZ3|t+1q9p`nGbg=q_OMk2dqs!^(;rEz<HA~O)P05K~Nvu)2$WH(&`0B0KySO5S3

diff --git a/esp32/libsmartconfig.a b/esp32/libsmartconfig.a
index f48990bac1940ea56cf143ffb8c6523fea6d688f..2faab9f56f6a40467755dee92c39dd2399fea829 100644
GIT binary patch
delta 27
jcmbQWj(gTR?uHh|Elgjd*i(~Cjf~7pw*QG@lB)p#mhTEH

delta 27
jcmbQWj(gTR?uHh|Elgjd*ez3yQVlJQxBrP^lB)p#mb?lx

diff --git a/esp32/libwapi.a b/esp32/libwapi.a
index bb71520c659880c6beb4e5f8673bdcd1c26c6864..9fa67aa8c44c73588cae3f5463e130c9f7e6ff4c 100644
GIT binary patch
delta 22
ecmcaKoB7gg<_)u0*i(~Cjf~7pHZNo`JP811p9oR_

delta 22
ecmcaKoB7gg<_)u0*ez3yQVlJQH!ox{JP811WC&US

diff --git a/esp32c3/libcoexist.a b/esp32c3/libcoexist.a
index eff5d9c6b4912cea2e1c6732679c613dbcc4a61f..6a07a81657e6d9440c6f5fd876f0052456ea71bb 100644
GIT binary patch
delta 37
tcmeB}$I>y6WkZ7;duo!Yk&&6n<cB@Zllc+_Hs6w)=EKOaxiEYBVgLhh4j=#k

delta 37
tcmeB}$I>y6WkZ7;yJf0Ts-dOv<cB@Zllc+_Hs6w)=ELZ)xiEYBVgLm#4rl-X

diff --git a/esp32c3/libcore.a b/esp32c3/libcore.a
index b9d74d8200440ff675391733550c957ba61ba9cb..c5925268a2bc9b77bc5bee566b6e415c210f0551 100644
GIT binary patch
delta 20
bcmZpXZ;{`yfr&je$<)Zm%w+R+rn5W%M&1U$

delta 20
bcmZpXZ;{`yfr;HR)hN}_(s=WBrn5W%MxzGD

diff --git a/esp32c3/libespnow.a b/esp32c3/libespnow.a
index 7b64c97d4faaff5f0eee09a4169173c898020370..6f2b1364540c8b911690236819f3dd25f3e8b889 100644
GIT binary patch
delta 22
ecmdlsnR(k}<_(90*;A8Djf~7pHlGxJyA=RtMhPGQ

delta 22
ecmdlsnR(k}<_(90*)3CzQVlJQH=h)KyA=Rt3kfIy

diff --git a/esp32c3/libmesh.a b/esp32c3/libmesh.a
index 382e4b3e21792573a9f5715adc61aebd183c69eb..1041dc18f49167df4a2bd5cf63e5c09f674ad5f0 100644
GIT binary patch
delta 83
zcmbPm$acaZ+YMVbv8N`P8X1|HOgG%m<J|mjQ~SS7j6lo;#LPg<0>rF9%m&2lK+FNe
WoIuP4#N0s41H`=B|83$ES_c5$H!ErY

delta 83
zcmbPm$acaZ+YMVbv0J7Zr5aiqPdD7p<J|mjQ~SS7j6lo;#LPg<0>rF9%m&2lK+FNe
WoIuP4#N0s41H`=B|83$ES_c5%<STLj

diff --git a/esp32c3/libnet80211.a b/esp32c3/libnet80211.a
index fa56c2187921e21af4dca4d00ab8d8b16d821a34..fad8584422631cbfdbf323823c669faec687dbb2 100644
GIT binary patch
delta 105
zcmdmV!+g^X^M)42Elg@##Z!|^jf~7pbc<4R^Gi}07@+)i+pSDM%nZaV+ikb9F3e_!
q$vjnHYk#W14#XVWpDJ)3i(+JKUsKHq#9Tnk4a7X#*HrVi6#xL&sV3h5

delta 105
zcmdmV!+g^X^M)42Elg@##Vu2fQVlJQb&FDS^Gi}07@+)i+pSDM%nZaV+ikb9F3e_!
q$vjnHYk#W14#XVWpDJ)3i(+JMUsKHq#9Tnk4a7X#*HrVi6#xL-z9#tq

diff --git a/esp32c3/libpp.a b/esp32c3/libpp.a
index aee01c0d7a31fe121db7423a45a8456ecd862237..de2ff46cf5858f39d8d45f22b9a6c1634dae073e 100644
GIT binary patch
delta 39
scmdmRUvk5J$%YojElez5*i(~Cjf~7p+PS|l0WmWWvux-7!n(8?062^fO8@`>

delta 39
scmdmRUvk5J$%YojElez5*ez3yQVlJQ+qu6m0WmWWvux-7!n(8?064i1Qvd(}

diff --git a/esp32c3/libsmartconfig.a b/esp32c3/libsmartconfig.a
index 7f5a35a7d6065f14566e5fb86d050a5cad465eb5..a26434e0d977a35714d638f08e89ecfdbceebb42 100644
GIT binary patch
delta 27
icmZp=!`*a;yP<_~3sYYUduo!Yk&&6n_NgsQxtRc#D+(C^

delta 27
icmZp=!`*a;yP<_~3sYYUyJf0Ts-dOv_NgsQxtRc!_zEEa

diff --git a/esp32c3/libwapi.a b/esp32c3/libwapi.a
index ee808be802a6b86160ade08355d3c938a925bbee..820e0376dc67716dac5de1b56aa9a37eb809d527 100644
GIT binary patch
delta 22
dcmeBs!PNJHX@iy+duo!Yk&&6nW<#;Na{*yr2qpjk

delta 22
dcmeBs!PNJHX@iy+yJf0Ts-dOvW<#;Na{*x_2rd8s

diff --git a/esp32s2/libcoexist.a b/esp32s2/libcoexist.a
index 2ecee50ac7ff923dd25b32ba43db0576b6954898..39e8667101f654f31c9f703b2284e7e278dbcab9 100644
GIT binary patch
delta 22
dcmX@m&vKxjWkZ()duo!Yk&&6n=7|#e?*U>|2t)t?

delta 22
dcmX@m&vKxjWkZ()yJf0Ts-dOv=7|#e?*U>N2uuI~

diff --git a/esp32s2/libcore.a b/esp32s2/libcore.a
index df154cc2c418607f887e931d9f3d0e7325acb3be..40eb873e368475890c79d16b67f3c79ac9656c17 100644
GIT binary patch
delta 24
fcmdm^yhnLMAR~KflBtoAnaSjbJQ|xD7;OXqXW<9B

delta 24
fcmdm^yhnLMAS1hFs!^(;rSas4JQ|xD7;OXqXT}G@

diff --git a/esp32s2/libespnow.a b/esp32s2/libespnow.a
index f5221925c535f57c4c0b04d75e47159eed626bc4..5eb9889cbb74404539c27fa28fbc29bb1bdfadc3 100644
GIT binary patch
delta 26
icmdn=mub^qrVWiO?5RnnMn+~PlLJ`AHqT=b*#!WQatVq6

delta 26
icmdn=mub^qrVWiO?3SrUsfL!ulLJ`AHqT=b*#!WQR|%2;

diff --git a/esp32s2/libmesh.a b/esp32s2/libmesh.a
index 7c8a41f1046cb3822a59b712ce1b4e8a0a992a70..5f88a67b28b179ca1b2ba5fa46eace5e8b04d968 100644
GIT binary patch
delta 88
zcmX>w*ZRO*>kT!2oT*8sMn+~P3@noy7l==u5X;iMz^{FQA0rSm0WmWWvj8zG5VHX>
aI}mdKF((jn0Wmia^8hjL_62@?3Jn0vYarnO

delta 88
zcmX>w*ZRO*>kT!2oR+CZsfL!u3@noy7l==u5X;iMz^{FQA0rSm0WmWWvj8zG5VHX>
aI}mdKF((jn0Wmia^8hjL_62@?3Jn0xKp^P=

diff --git a/esp32s2/libnet80211.a b/esp32s2/libnet80211.a
index 5747599235badf257866edb0cb26c4594f334626..c2eba969c133c355b63e0238e7785885451babb2 100644
GIT binary patch
delta 119
zcmccf)A7zv$A%Wh7N#xCUlheslT3|_%uIBPQgic5QW>D!b}l7mAZ7t#*6mzMY*9zq
zp)%9`{;(;v_daI>Vs;?r0AkMVz0bL(r7$wKtN3sOF%J;)0x=&D^KV!25!hh>0LHZ_
ATmS$7

delta 119
zcmccf)A7zv$A%Wh7N#xCUlheGQ;kv$Esb@HQgic5QW>D!b}l7mAZ7t#*6mzMY*9zq
zp)%9`{;(;v_daI>Vs;?r0AkMVz0bL(r7$wLtN3sOF%J;)0x=&D^KV!25!hh>0L=m@
Ab^rhX

diff --git a/esp32s2/libpp.a b/esp32s2/libpp.a
index bbb9bc1c01ffde4080c0714729f0ba0b44dd6512..51140a8d8b7eae5392d107ed1c22b97ff54bcf75 100644
GIT binary patch
delta 45
wcmew}UE$Akg@zW!7N#xCIf?A4Nv1|dW+v^$iOfLE0>rF9%(lHak-c*j0E*-giU0rr

delta 45
wcmew}UE$Akg@zW!7N#xCIf?9+sYa=Wmd5SHiOfLE0>rF9%(lHak-c*j0E;mYk^lez

diff --git a/esp32s2/libsmartconfig.a b/esp32s2/libsmartconfig.a
index e48e681449bc2cb8cbc581cdca8fa64c6e0e045b..8ca02541e40ea40d2def742a64b81a5dd2a80e4f 100644
GIT binary patch
delta 27
jcmaDii~HRy?uHh|Elg!W?5RnnMn+~P+iQcEK2`w$ns^Fs

delta 27
jcmaDii~HRy?uHh|Elg!W?3SrUsfL!u+iQcEK2`w$nnenB

diff --git a/esp32s2/libwapi.a b/esp32s2/libwapi.a
index d2638bf77ed4e6d04d972d179ccdbebf44334c91..71d6183f19115b70d8e8ba103bda2da5e092dda9 100644
GIT binary patch
delta 22
ecmbO?lX>1u<_(ir*i(~Cjf~7pHqT^XJplk+3<s$I

delta 22
ecmbO?lX>1u<_(ir*ez3yQVlJQH_v2YJplk*(Fd^r

diff --git a/esp32s3/libcoexist.a b/esp32s3/libcoexist.a
index a713770b6950b58aee39f8cef2a9ee15504e8334..0ec5b1e065da96e0086a06a4b67d155ccd779ada 100644
GIT binary patch
delta 30
mcmdn>iDlO(mJJ0`?5RnnMn+~PlMC&|oBO1;_en9Xkplp}AqyJ-

delta 30
mcmdn>iDlO(mJJ0`?3SrUsfL!ulMC&|oBO1;_en9Xkplp}CJQ3~

diff --git a/esp32s3/libcore.a b/esp32s3/libcore.a
index a060307829e1036c5ca0837a0690dc3e89817793..368c4ea1021cb73c5384bf05e2aa5685c3c01fcb 100644
GIT binary patch
delta 24
fcmcbjdPQ|ZAR~KflBtoAnaSivUX9HSj3I&mX~74m

delta 24
fcmcbjdPQ|ZAS1hFs!^(;rSarOUX9HSj3I&mX{HCT

diff --git a/esp32s3/libespnow.a b/esp32s3/libespnow.a
index 3a5338c8945bab4fe75742681a09c3af145c3a84..57e8925fb2fc5d88c22a7b8eac54c1f7ff8132b8 100644
GIT binary patch
delta 26
icmX^1kLlPyrVWiO?5RnnMn+~PlLJ`AHqT>Ou?ql|oeD?*

delta 26
icmX^1kLlPyrVWiO?3SrUsfL!ulLJ`AHqT>Ou?ql|f(lRo

diff --git a/esp32s3/libmesh.a b/esp32s3/libmesh.a
index 5535dec5c8b75257a6afcc061d9fe068428ef389..71d6a99744c4c6ff2e453e73417e7142d3c95750 100644
GIT binary patch
delta 86
zcmZozVBN65dP9vLduo!Yk&&6n<oC-|C(BfEG;i>0-{8jx#7scU48$xz%nHP8K+F!r
Y96-zo#9Tnk4a7V^%)5PqA74Nt0KzmOu>b%7

delta 86
zcmZozVBN65dP9vLyJf0Ts-dOv<oC-|C(BfEG;i>0-{8jx#7scU48$xz%nHP8K+F!r
Y96-zo#9Tnk4a7V^%)5PqA74Nt0K@qqxc~qF

diff --git a/esp32s3/libnet80211.a b/esp32s3/libnet80211.a
index 6f41881e6154487de660b28cc6443787ecbe5b96..0b4d269cc83ccdfecad3267f6497be7caa5dfcd3 100644
GIT binary patch
delta 139
zcmezK+V0P5yM`9V7N#xC4<uw$lT3|_%uIBPQgic5QW>CJ1~A~CJ~4x>d-{PtTpaBa
zB$<Jj1&CR<PmpAL!NU$!I^DmMMRn34mi85DY(UHo#2i4(xqXEi*Y{LL#`Xn0TtLhX
S#5_RE3&ece7xeJQXaWEl8ZgWN

delta 139
zcmezK+V0P5yM`9V7N#xC4<uwQQ;kv$Esb@HQgic5QW>CJ1~A~CJ~4x>d-{PtTpaBa
zB$<Jj1&CR<PmpAL!NU$!I^DmMMRn34mi85DY(UHo#2i4(xqXEi*Y{LL=Jo|WTtLhX
S#5_RE3&ece7xeJQXaWEszcA(i

diff --git a/esp32s3/libpp.a b/esp32s3/libpp.a
index 8a5d04dee2d4e601af0fc14a3ef0c6d54d57537c..8656f16bb39b367b6be3676e202c8375463d722e 100644
GIT binary patch
delta 45
vcmdlmQE|gW#fBEf7N#xCF4gR*Nv1|dW+v_4)yzQ50>rF9%(mSdD0LP9X;u%D

delta 45
wcmdlmQE|gW#fBEf7N#xCF4gRosYa=Wmd5Sg)yzQ50>rF9%(mUTnmzR_0BNHSn*aa+

diff --git a/esp32s3/libsmartconfig.a b/esp32s3/libsmartconfig.a
index e54330d22031f034a7099c3a9e8a711773e2d763..4a3e24b88cf3dc4bb1ddfa87385aeac541e3b12c 100644
GIT binary patch
delta 27
jcmbQXjC<NL?uHh|EliKX*;A8Djf~7pw!aK#(yaynlJE)j

delta 27
jcmbQXjC<NL?uHh|EliKX*)3CzQVlJQx4#T$(yaynlD!H2

diff --git a/esp32s3/libwapi.a b/esp32s3/libwapi.a
index fb734118ef911a8cc3360dce6f309fc87354be3f..7ea23d64c9c21addf9eb93a64f7c5f03704f1b6d 100644
GIT binary patch
delta 22
ecmZph$=o)RdBY?Y_S7U(BO^1D%`;iv9tQwh0|;OM

delta 22
ecmZph$=o)RdBY?YcFR<wR6|SS%`;iv9tQwg$Ovcv