[bot] AutoMerging: merge all upstream's changes:

* https://github.com/coolsnowwolf/lede:
  ipq60xx: add 360_v6 ath11k wifi BDF
  ath11k-wifi: add board bdf files package
  kernel: sysctl: update nf_ct_expect settings for fullcone nat mode 2
  Revert "dnsmasq: bump to v2.87"
  x86: add kmod-tg3 by default

package/firmware/ath11k-wifi/Makefile

@@ -0,0 +1,92 @@
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/version.mk
+
+PKG_NAME:=ath11k-wifi
+PKG_RELEASE:=1
+PKG_FLAGS:=nonshared
+
+include $(INCLUDE_DIR)/package.mk
+
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)
+endef
+
+define Build/Compile
+endef
+
+# Use ath10k-bdencoder from https://github.com/qca/qca-swiss-army-knife.git
+# to generate the board-* files here.
+#
+# This is intended to be used on an interim basis until device-specific
+# board data for new devices is available through the upstream compilation
+#
+# Please send a mail with your device-specific board files upstream.
+# You can find instructions and examples on the linux-wireless wiki:
+# <https://wireless.wiki.kernel.org/en/users/drivers/ath10k/boardfiles>
+
+ALLWIFIBOARDS:= \
+	gl-ax1800 \
+	gl-axt1800 \
+	qihoo_v6
+
+ALLWIFIPACKAGES:=$(foreach BOARD,$(ALLWIFIBOARDS),ath11k-wifi-$(BOARD))
+
+define Package/ath11k-wifi-default
+  SUBMENU:=ath11k Board-Specific Overrides
+  SECTION:=firmware
+  CATEGORY:=Firmware
+  DEPENDS:=@TARGET_ipq60xx
+  TITLE:=Custom Board
+endef
+
+define ath11k-wifi-install-one-to
+  $(INSTALL_DIR)  $(2)/lib/firmware/ath11k/$(3)/
+  $(INSTALL_DATA) $(1) $(2)/lib/firmware/ath11k/$(3)/board-2.bin
+endef
+
+define ath11k-wifi-install-one
+  $(if $(filter $(suffix $(1)),.IPQ6018 .ipq6018),\
+    $(call ath11k-wifi-install-one-to,$(1),$(2),IPQ6018/hw1.0),\
+    $(error Unrecognized board-file suffix '$(suffix $(1))' for '$(1)')\
+  )
+
+endef
+# Blank line required at end of above define due to foreach context
+
+define generate-ath11k-wifi-package
+  define Package/ath11k-wifi-$(1)
+    $(call Package/ath11k-wifi-default)
+    TITLE:=board-2.bin Overrides for $(2)
+    CONFLICTS:=$(PREV_BOARD)
+  endef
+
+  define Package/ath11k-wifi-$(1)/description
+The $(2) requires board-specific, reference ("cal") data
+that is not yet present in the upstream wireless firmware distribution.
+
+This package supplies board-2.bin file(s) that, in the interim,
+overwrite those supplied by the ath10k-firmware-* packages.
+
+This is package is only necessary for the $(2).
+
+Do not install it for any other device!
+  endef
+
+  define Package/ath11k-wifi-$(1)/install-overlay
+    $$$$(foreach IPQ_WIFI_BOARD_FILE,$$$$(wildcard board-$(1).*),\
+      $$$$(call ath11k-wifi-install-one,$$$$(IPQ_WIFI_BOARD_FILE),$$(1)))
+  endef
+
+  PREV_BOARD+=ath11k-wifi-$(1)
+endef
+
+# Add board name to ALLWIFIBOARDS
+# Place files in this directory as board-<devicename>.<qca4019|qca9888|qca9984>
+# Add $(eval $(call generate-ath11k-wifi-package,<devicename>,<display name>))
+
+$(eval $(call generate-ath11k-wifi-package,gl-ax1800,Gl.iNET AX1800))
+$(eval $(call generate-ath11k-wifi-package,gl-axt1800,Gl.iNET AXT1800))
+$(eval $(call generate-ath11k-wifi-package,qihoo_v6,QIHOO 360V6))
+
+
+$(foreach PACKAGE,$(ALLWIFIPACKAGES),$(eval $(call BuildPackage,$(PACKAGE))))

package/firmware/ath11k-wifi/qdss_trace_config.bin

@@ -0,0 +1,99 @@
+//This comment and parser will ignore
+//Tracer scenario(or commands) always
+//starts with start keyword
+//Below commands to enable Event traces on UMAC,MAC0,MAC1
+//seq_start;
+//seq_type:mem_req;
+//memory size always given in KB. beow example reserves 3 buffers segments of 16 KB.
+//sink:etr_ddr,0x1,0x1000;
+//seq_end;
+//Below commands to enable Event traces on UMAC,MAC0,MAC1
+seq_start;
+seq_type:mac_event_trace;
+sink:etr_ddr;
+subsys_cfg_start:mac0;
+hwsch:0x1, 0x000FFFF1,0x1036052C,0x0,0x0;
+rxdma:0x2, 0x3400,0x8000,0x0,0x0;
+crypto:0x3, 0xF79B3770,0x0,0x0,0x0;
+txpcu:0x4, 0xD687F4E7,0x20000092,0x0,0x0;
+txole:0x5, 0x640F0622,0x2,0x0,0x0;
+pdg:0x6, 0x3C800706,0x0,0x0,0x0;
+subsys_cfg_end:mac0;
+subsys_cfg_start:mac1;
+hwsch:0x7, 0x000FFFF1,0x1036052C,0x0,0x0;
+rxdma:0x8, 0x3400,0x8000,0x0,0x0;
+crypto:0x9, 0xF79B3770,0x0,0x0,0x0;
+txpcu:0xA, 0xD687F4E7,0x20000092,0x0,0x0;
+txole:0xB, 0x640F0622,0x2,0x0,0x0;
+pdg:0xC, 0x3C800706,0x0,0x0,0x0;
+subsys_cfg_end:mac1;
+swap:0xFFFFFFFF;
+trigger_start:trc;
+wfi:0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF;
+ts0:0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF;
+ts1:0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF;
+ts2:0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF;
+ts3:0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF;
+ts4:0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF;
+trigger_end:trc;
+memw:0xFFFFFFFF,0xFFFFFFFF;
+seq_end;
+// Below commands to enable obo trace on the mac0
+//seq_start;
+//seq_type:mac_obo_trace;
+//sink:etb_wcss;
+//subsys_cfg_start:mac0;
+//hwsch:0x1,0xABCDABCD;
+//subsys_cfg_end:mac0;
+//swap:0xABCDABCD;
+//trigger_start:trc;
+//wfi:0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF;
+//ts0:0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF;
+//ts1:0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF;
+//ts2:0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF;
+//ts3:0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF;
+//ts4:0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF;
+//trigger_end:trc;
+//memw:0xFFFFFFFF,0xFFFFFFFF;
+//seq_end;
+// Below commands to enable TLV trace on the mac0
+//seq_start;
+//seq_type:mac_tlv_trace;
+//sink:etb_wcss;
+//subsys_cfg_start:mac0;
+//tlv_port:PDG_TXDMA_TLV;
+//subsys_cfg_end:mac0;
+//seq_end;
+// Below commands to enable q6 etm
+//seq_start;
+//seq_type:q6_etm_trace;
+//sink:etr_ddr;
+//seq_end;
+// Below commands to enable umac noc traces
+//seq_start;
+//seq_type:umac_noc_trace;
+//sink:etb_wcss;
+//ctrl:0x12;
+//port_sel:0x4;
+//lut:0xA;
+//routeid_base:0x01000000;
+//routeid_mask:0x01c00000;
+//addr_lo:0x0;
+//addr_hi:0x0;
+//win_size:0x25;
+//req_opcode:0x3;
+//res_status:0x3;
+//fltr_len:0xF;
+//async_period:0xC;
+//seq_end;
+// Below commands to enable umac noc traces
+//seq_start;
+//seq_type:phy_tlv_trace;
+//sink:etr_ddr;
+//seq_end;
+//seq_start;
+//seq_type:phy_event_trace;
+//sink:etr_ddr;
+//phya:0x1,0x1;
+//phyb:0x1,0x1;
+//seq_end;

package/kernel/linux/files/sysctl-nf-conntrack.conf

@@ -9,4 +9,4 @@ net.netfilter.nf_conntrack_udp_timeout=60
 net.netfilter.nf_conntrack_udp_timeout_stream=180
 net.netfilter.nf_conntrack_helper=1
 net.netfilter.nf_conntrack_buckets=16384
-net.netfilter.nf_conntrack_expect_max=512
+net.netfilter.nf_conntrack_expect_max=16384

package/network/services/dnsmasq/Makefile

@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dnsmasq
-PKG_UPSTREAM_VERSION:=2.87
+PKG_UPSTREAM_VERSION:=2.86
 PKG_VERSION:=$(subst test,~~test,$(subst rc,~rc,$(PKG_UPSTREAM_VERSION)))
 PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_UPSTREAM_VERSION).tar.xz
-PKG_SOURCE_URL:=https://thekelleys.org.uk/dnsmasq/
-PKG_HASH:=0228c0364a7f2356fd7e7f1549937cbf3099a78d3b2eb1ba5bb0c31e2b89de7a
+PKG_SOURCE_URL:=https://thekelleys.org.uk/dnsmasq
+PKG_HASH:=28d52cfc9e2004ac4f85274f52b32e1647b4dbc9761b82e7de1e41c49907eb08
 
 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=COPYING

package/network/services/dnsmasq/files/dhcp.conf

@@ -21,7 +21,6 @@ config dnsmasq
 	#list bogusnxdomain     '64.94.110.11'
 	option localservice	1  # disable to allow DNS requests from non-local subnets
 	option filter_aaaa	1
-	option filter_a		0
 	option cachesize	8000
 	option mini_ttl		3600
 	option ednspacket_max	1232

package/network/services/dnsmasq/files/dnsmasq.init

@@ -930,8 +930,9 @@ dnsmasq_start()
 	append_bool "$cfg" rapidcommit "--dhcp-rapid-commit"
 	append_bool "$cfg" scriptarp "--script-arp"
 
-	append_bool "$cfg" filter_aaaa "--filter-AAAA"
-	append_bool "$cfg" filter_a "--filter-A"
+	append_bool "$cfg" filter_aaaa "--filter-aaaa"
+	append_bool "$cfg" filter_https "--filter-https"
+	append_bool "$cfg" filter_unknown "--filter-unknown"
 
 	append_parm "$cfg" logfacility "--log-facility"