OSDN Git Service

Merge Official Source master
authorTianling Shen <cnsztl@immortalwrt.org>
Tue, 27 Sep 2022 09:06:04 +0000 (17:06 +0800)
committerTianling Shen <cnsztl@immortalwrt.org>
Tue, 27 Sep 2022 09:06:04 +0000 (17:06 +0800)
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
1  2 
package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
scripts/download.pl
target/linux/generic/config-5.10
target/linux/generic/config-5.15
target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
target/linux/mediatek/mt7623/config-5.15
target/linux/rockchip/armv8/config-5.15
target/linux/uml/Makefile

@@@ -138,8 -138,8 +138,8 @@@ mac80211_hostapd_setup_base() 
        [ -n "$acs_exclude_dfs" ] && [ "$acs_exclude_dfs" -gt 0 ] &&
                append base_cfg "acs_exclude_dfs=1" "$N"
  
-       json_get_vars noscan ht_coex min_tx_power:0 vendor_vht
-       json_get_values ht_capab_list ht_capab tx_burst
 -      json_get_vars noscan ht_coex min_tx_power:0 tx_burst
++      json_get_vars noscan ht_coex min_tx_power:0 tx_burst vendor_vht
+       json_get_values ht_capab_list ht_capab
        json_get_values channel_list channels
  
        [ "$auto_channel" = 0 ] && [ -z "$channel_list" ] && \
Simple merge
Simple merge
Simple merge
@@@ -303,12 -276,9 +303,10 @@@ CONFIG_INPUT_FF_MEMLESS=
  CONFIG_INPUT_KEYBOARD=y
  CONFIG_INPUT_LEDS=y
  CONFIG_INPUT_MATRIXKMAP=y
 +CONFIG_INPUT_RK805_PWRKEY=y
  CONFIG_IOMMU_API=y
  # CONFIG_IOMMU_DEBUGFS is not set
- # CONFIG_IOMMU_DEFAULT_DMA_LAZY is not set
 -CONFIG_IOMMU_DEFAULT_PASSTHROUGH=y
 +CONFIG_IOMMU_DEFAULT_DMA_STRICT=y
- # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
  CONFIG_IOMMU_DMA=y
  CONFIG_IOMMU_IOVA=y
  CONFIG_IOMMU_IO_PGTABLE=y
Simple merge