diff --git a/patches/0001-Remove-TX-power-limitations-and-country.patch b/patches/0001-Remove-TX-power-limitations-and-country.patch deleted file mode 100644 index 15ddf80f..00000000 --- a/patches/0001-Remove-TX-power-limitations-and-country.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- a/lib/wifi/qcawificfg80211.sh -+++ b/lib/wifi/qcawificfg80211.sh -@@ -2020,14 +2020,11 @@ - - config_get bintval "$vif" bintval - [ -n "$bintval" ] && "$device_if" "$ifname" bintval "$bintval" - -- config_get_bool countryie "$vif" countryie 0 -+ config_get_bool countryie "$vif" countryie 1 - [ -n "$countryie" ] && "$device_if" "$ifname" countryie "$countryie" -- -- config_get_bool vap_contryie "$vif" vap_contryie 0 -- [ -n "$vap_contryie" ] && "$device_if" "$ifname" vap_contryie "$vap_contryie" - - config_get ppdu_duration "$device" ppdu_duration - [ -n "$ppdu_duration" ] && "$device_if" "$phy" ppdu_duration "${ppdu_duration}" - - config_get he_ul_ppdu_dur "$device" he_ul_ppdu_dur -@@ -2978,34 +2978,18 @@ - max_power=30 - fi - if [ "$bd_country_code" = "EU" ]; then - if [ "$bdmode" = "24G" ]; then -- max_power=14 -+ max_power=17 - else - if [ "$channel" -ge 100 ]; then - max_power=23 - else -- max_power=16 -+ max_power=20 - fi - fi -- if [ $ifname = "wl2" ]; then -- max_power=13 -- fi - fi -- #miwifi: reduce 3db for Brazil band1 -- if [ "$nv_country_code" = "BR" ]; then -- if [ "$bdmode" = "5G" -a "$channel" -le 48 ]; then -- max_power=13 -- fi -- fi -- #miwifi: we use band1 txpower for wifi ap mode -- netmode=`uci get xiaoqiang.common.NETMODE` -- if [ -n "$netmode" -a "$netmode" = "wifiapmode" -a "$bdmode" = "5G" ]; then -- max_power=16 -- if [ "$nv_country_code" = "BR" ]; then -- max_power=13 -- fi -- fi -+ - config_get txpwr "$device" txpwr - if [ "$txpwr" = "mid" ]; then - txpower=`expr $max_power - 1` - elif [ "$txpwr" = "min" ]; then diff --git a/patches/country-info.patch b/patches/country-info.patch new file mode 100644 index 00000000..0c2e5666 --- /dev/null +++ b/patches/country-info.patch @@ -0,0 +1,18 @@ +--- a/lib/wifi/qcawificfg80211.sh ++++ b/lib/wifi/qcawificfg80211.sh +@@ -2020,14 +2020,11 @@ + + config_get bintval "$vif" bintval + [ -n "$bintval" ] && "$device_if" "$ifname" bintval "$bintval" + +- config_get_bool countryie "$vif" countryie 0 ++ config_get_bool countryie "$vif" countryie 1 + [ -n "$countryie" ] && "$device_if" "$ifname" countryie "$countryie" +- +- config_get_bool vap_contryie "$vif" vap_contryie 0 +- [ -n "$vap_contryie" ] && "$device_if" "$ifname" vap_contryie "$vap_contryie" + + config_get ppdu_duration "$device" ppdu_duration + [ -n "$ppdu_duration" ] && "$device_if" "$phy" ppdu_duration "${ppdu_duration}" + + config_get he_ul_ppdu_dur "$device" he_ul_ppdu_dur