你好 wdr7500v3刷了archer c7固件后5g（AC信道）无法连接！

feeds.conf.981213

@@ -0,0 +1,14 @@
+src-git packages https://github.com/981213/packages.git
+src-git luci https://github.com/981213/luci-1.git
+src-git routing https://github.com/openwrt-routing/packages.git
+src-git telephony http://git.openwrt.org/feed/telephony.git
+src-git management https://github.com/openwrt-management/packages.git
+src-git oldpackages http://git.openwrt.org/packages.git
+#src-svn xwrt http://x-wrt.googlecode.com/svn/trunk/package
+#src-svn phone svn://svn.openwrt.org/openwrt/feeds/phone
+#src-svn efl svn://svn.openwrt.org/openwrt/feeds/efl
+#src-svn xorg svn://svn.openwrt.org/openwrt/feeds/xorg
+#src-svn desktop svn://svn.openwrt.org/openwrt/feeds/desktop
+#src-svn xfce svn://svn.openwrt.org/openwrt/feeds/xfce
+#src-svn lxde svn://svn.openwrt.org/openwrt/feeds/lxde
+#src-link custom /usr/src/openwrt/custom-feed

feeds.conf.default

@@ -1,5 +1,5 @@
-src-git packages https://github.com/openwrt/packages.git
-src-git luci https://github.com/openwrt/luci.git
+src-git packages https://github.com/981213/packages.git
+src-git luci https://github.com/981213/luci-1.git
 src-git routing https://github.com/openwrt-routing/packages.git
 src-git telephony https://github.com/openwrt/telephony.git
 src-git management https://github.com/openwrt-management/packages.git

include/image.mk

@@ -17,13 +17,14 @@ override NO_TRACE_MAKE:=$(_SINGLE)$(NO_TRACE_MAKE)
 KDIR=$(KERNEL_BUILD_DIR)
 KDIR_TMP=$(KDIR)/tmp
 DTS_DIR:=$(LINUX_DIR)/arch/$(LINUX_KARCH)/boot/dts
+BUILD_DATE_PREFIX := $(shell date +'%F')
 
 sanitize = $(call tolower,$(subst _,-,$(1)))
 
 DIST_SANITIZED:=$(call sanitize,$(VERSION_DIST))
 EXTRA_NAME_SANITIZED=$(call sanitize,$(EXTRA_IMAGE_NAME))
 
-IMG_PREFIX:=$(DIST_SANITIZED)-$(if $(CONFIG_VERSION_FILENAMES),$(VERSION_NUMBER)-)$(if $(EXTRA_NAME_SANITIZED),$(EXTRA_NAME_SANITIZED)-)$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET))
+IMG_PREFIX:=$(DIST_SANITIZED)-by-981213-$(if $(CONFIG_VERSION_FILENAMES),$(VERSION_NUMBER)-)$(if $(EXTRA_NAME_SANITIZED),$(EXTRA_NAME_SANITIZED)-)$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET))
 
 MKFS_DEVTABLE_OPT := -D $(INCLUDE_DIR)/device_table.txt
 

include/netfilter.mk

@@ -102,6 +102,10 @@ $(eval $(call nf_add,IPT_EXTRA,CONFIG_NETFILTER_XT_MATCH_QUOTA, $(P_XT)xt_quota)
 
 $(eval $(call nf_add,IPT_FILTER,CONFIG_NETFILTER_XT_MATCH_STRING, $(P_XT)xt_string))
 
+# imq
+
+$(eval $(call nf_add,IPT_IMQ,CONFIG_IP_NF_TARGET_IMQ, $(P_V4)ipt_IMQ))
+$(eval $(call nf_add,IPT_IMQ,CONFIG_NETFILTER_XT_TARGET_IMQ, $(P_XT)xt_IMQ))
 
 # ipopt
 
@@ -168,6 +172,7 @@ $(eval $(call nf_add,IPT_IPV6_EXTRA,CONFIG_IP6_NF_MATCH_EUI64, $(P_V6)ip6t_eui64
 $(eval $(call nf_add,IPT_IPV6_EXTRA,CONFIG_IP6_NF_MATCH_OPTS, $(P_V6)ip6t_hbh))
 $(eval $(call nf_add,IPT_IPV6_EXTRA,CONFIG_IP6_NF_MATCH_FRAG, $(P_V6)ip6t_frag))
 $(eval $(call nf_add,IPT_IPV6_EXTRA,CONFIG_IP6_NF_MATCH_RT, $(P_V6)ip6t_rt))
+$(eval $(call nf_add,IPT_IPV6,CONFIG_IP6_NF_TARGET_IMQ, $(P_V6)ip6t_IMQ))
 
 # nat
 
@@ -352,6 +357,7 @@ IPT_BUILTIN += $(IPT_CONNTRACK-y)
 IPT_BUILTIN += $(IPT_CONNTRACK_EXTRA-y)
 IPT_BUILTIN += $(IPT_EXTRA-y)
 IPT_BUILTIN += $(IPT_FILTER-y)
+IPT_BUILTIN += $(IPT_IMQ-y)
 IPT_BUILTIN += $(IPT_IPOPT-y)
 IPT_BUILTIN += $(IPT_IPRANGE-y)
 IPT_BUILTIN += $(IPT_CLUSTER-y)
@@ -375,5 +381,24 @@ IPT_BUILTIN += $(EBTABLES-y)
 IPT_BUILTIN += $(EBTABLES_IP4-y)
 IPT_BUILTIN += $(EBTABLES_IP6-y)
 IPT_BUILTIN += $(EBTABLES_WATCHERS-y)
-
 endif # __inc_netfilter
+
+
+IPT_WEBURL-m :=
+IPT_WEBURL-$(CONFIG_IP_NF_MATCH_WEBURL) += $(P_V4)ipt_weburl
+IPT_BUILTIN += $(IPT_WEBURL-y)
+
+
+IPT_WEBMON-m :=
+IPT_WEBMON-$(CONFIG_IP_NF_MATCH_WEBMON) += $(P_V4)ipt_webmon
+IPT_BUILTIN += $(IPT_WEBMON-y)
+
+
+IPT_TIMERANGE-m :=
+IPT_TIMERANGE-$(CONFIG_IP_NF_MATCH_TIMERANGE) += $(P_V4)ipt_timerange
+IPT_BUILTIN += $(IPT_TIMERANGE-y)
+
+
+IPT_BANDWIDTH-m :=
+IPT_BANDWIDTH-$(CONFIG_IP_NF_MATCH_BANDWIDTH) += $(P_V4)ipt_bandwidth
+IPT_BUILTIN += $(IPT_BANDWIDTH-y)

include/toplevel.mk

@@ -6,7 +6,7 @@
 # See /LICENSE for more information.
 #
 
-RELEASE:=Designated Driver
+RELEASE:=Designated Driver by 981213
 PREP_MK= OPENWRT_BUILD= QUIET=0
 
 export IS_TTY=$(shell tty -s && echo 1 || echo 0)

include/version.mk

@@ -72,6 +72,8 @@ VERSION_TAINTS := $(strip $(foreach taint,$(VERSION_TAINT_SPECS), \
 
 PKG_CONFIG_DEPENDS += $(foreach taint,$(VERSION_TAINT_SPECS),$(call taint2sym,$(taint)))
 
+BUILT_DATE := $(shell date +'%b %e %Y')
+
 VERSION_SED:=$(SED) 's,%U,$(VERSION_REPO),g' \
 	-e 's,%V,$(VERSION_NUMBER),g' \
 	-e 's,%v,\L$(subst $(space),_,$(VERSION_NUMBER)),g' \
@@ -88,6 +90,7 @@ VERSION_SED:=$(SED) 's,%U,$(VERSION_REPO),g' \
 	-e 's,%M,$(VERSION_MANUFACTURER),g' \
 	-e 's,%m,$(VERSION_MANUFACTURER_URL),g' \
 	-e 's,%P,$(VERSION_PRODUCT),g' \
-	-e 's,%h,$(VERSION_HWREV),g'
+	-e 's,%h,$(VERSION_HWREV),g' \
+	-e 's,%B,$(BUILT_DATE),g'
 
 VERSION_SED_SCRIPT:=$(subst '\'','\'\\\\\'\'',$(VERSION_SED))

package/base-files/files/etc/banner

@@ -4,7 +4,7 @@
  |_______||   __|_____|__|__||________||__|  |____|
           |__| W I R E L E S S   F R E E D O M
  -----------------------------------------------------
- DESIGNATED DRIVER (%C, %R)
+ DESIGNATED DRIVER (%C, %R)  By 981213
  -----------------------------------------------------
   * 2 oz. Orange Juice         Combine all juices in a
   * 2 oz. Pineapple Juice      tall glass filled with

package/base-files/files/etc/config/system

@@ -1,6 +1,7 @@
 config system
 	option hostname	OpenWrt
-	option timezone	UTC
+	option zonename 'Asia/Shanghai'
+	option timezone	'CST-8'
 
 config timeserver ntp
 	list server	0.openwrt.pool.ntp.org

package/base-files/files/etc/init.d/boot

@@ -39,7 +39,7 @@ boot() {
 	/sbin/kmodloader
 
 	# allow wifi modules time to settle
-	sleep 1
+	sleep 3
 
 	/sbin/wifi detect > /tmp/wireless.tmp
 	[ -s /tmp/wireless.tmp ] && {

package/base-files/files/etc/openwrt_release

@@ -3,5 +3,5 @@ DISTRIB_RELEASE='%C'
 DISTRIB_REVISION='%R'
 DISTRIB_CODENAME='%n'
 DISTRIB_TARGET='%S'
-DISTRIB_DESCRIPTION='%D %N %V'
+DISTRIB_DESCRIPTION='%D %N %V.Built on %B'
 DISTRIB_TAINTS='%t'

package/base-files/files/etc/rc.button/reset

@@ -1,6 +1,7 @@
 #!/bin/sh
 
 . /lib/functions.sh
+. /etc/diag.sh
 
 case "$ACTION" in
 pressed)
@@ -11,14 +12,42 @@ timeout)
 	set_state failsafe
 ;;
 released)
+	get_status_led
 	if [ "$SEEN" -lt 1 ]
 	then
-		echo "REBOOT" > /dev/console
-		sync
-		reboot
+		type hostapd_cli || exit
+
+		cd /var/run/hostapd
+		for socket in *; do
+			[ -S "$socket" ] || continue
+			[ "$(hostapd_cli -i "$socket" wps_pbc)" = "OK" ] && {
+				WPS_LED=$(ls /sys/class/leds | grep -E 'qss|wps' | head -n 1)
+				[ -z "$WPS_LED" ] || {
+					led_timer $WPS_LED 300 300
+					hostapd_cli -i "$socket" -P /var/run/hostapd-cli-wpsled-$socket.pid -a /lib/hostapd_wps_led.sh -B
+				}
+			}
+		done
+
+	elif [ "$SEEN" -le 5 ] && [ "$SEEN" -ge 2 ]
+	then
+		echo "Unmount Hard Disks" > /dev/console
+		led_timer $status_led 300 300
+		[ -f /etc/init.d/xunlei ] && /etc/init.d/xunlei stop
+		[ -f /etc/init.d/aria2 ] && /etc/init.d/aria2 stop
+		[ -f /etc/init.d/transmission ] && /etc/init.d/transmission stop
+		[ -f /etc/init.d/samba ] && /etc/init.d/samba stop
+		[ -f /etc/init.d/vsftpd ] && /etc/init.d/vsftpd stop
+		umount /dev/sd*
+		logger -t Auto-Mount "Button action: Unmount Hard Disks"
+		[ -f /etc/init.d/samba ] && /etc/init.d/samba start
+		[ -f /etc/init.d/vsftpd ] && /etc/init.d/vsftpd start
+		sleep 1
+		status_led_on
 	elif [ "$SEEN" -gt 5 ]
 	then
 		echo "FACTORY RESET" > /dev/console
+		status_led_blink_failsafe
 		jffs2reset -y && reboot &
 	fi
 ;;

package/boot/uboot-envtools/files/ar71xx

@@ -51,7 +51,10 @@ wzr-hp-ag300h)
 	ubootenv_add_uci_config "/dev/mtd3" "0x0" "0x10000" "0x10000"
 	;;
 qihoo-c301)
-	ubootenv_add_uci_config "/dev/mtd9" "0x0" "0x10000" "0x10000"
+	if cat /proc/mtd | grep action_image_config; then
+		local mtd=$(cat /proc/mtd | grep action_image_config | sed 's/mtd\([0-9]*\):.*/\1/g')
+		ubootenv_add_uci_config "/dev/mtd${mtd}" "0x0" "0x10000" "0x10000"
+	fi
 	;;
 esac
 

package/kernel/linux/modules/fs.mk

@@ -421,7 +421,9 @@ define KernelPackage/fs-vfat
   TITLE:=VFAT filesystem support
   KCONFIG:= \
 	CONFIG_FAT_FS \
-	CONFIG_VFAT_FS
+	CONFIG_VFAT_FS \
+	CONFIG_FAT_DEFAULT_IOCHARSET="utf8" \
+	CONFIG_FAT_DEFAULT_CODEPAGE=936
   FILES:= \
 	$(LINUX_DIR)/fs/fat/fat.ko \
 	$(LINUX_DIR)/fs/fat/vfat.ko

package/kernel/linux/modules/netfilter.mk

@@ -368,6 +368,27 @@ endef
 
 $(eval $(call KernelPackage,nf-nathelper-extra))
 
+define KernelPackage/ipt-imq
+  TITLE:=Intermediate Queueing support
+  KCONFIG:= \
+	CONFIG_IMQ \
+	CONFIG_IMQ_BEHAVIOR_BA=y \
+	CONFIG_IMQ_NUM_DEVS=2 \
+	CONFIG_NETFILTER_XT_TARGET_IMQ
+  FILES:= \
+	$(LINUX_DIR)/drivers/net/imq.$(LINUX_KMOD_SUFFIX) \
+	$(foreach mod,$(IPT_IMQ-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
+  AUTOLOAD:=$(call AutoProbe,$(notdir imq \
+	$(IPT_IMQ-m) \
+  ))
+  $(call AddDepends/ipt)
+endef
+
+define KernelPackage/ipt-imq/description
+ Kernel support for Intermediate Queueing devices
+endef
+
+$(eval $(call KernelPackage,ipt-imq))
 
 define KernelPackage/ipt-ulog
   TITLE:=Module for user-space packet logging
@@ -849,3 +870,47 @@ endef
 
 $(eval $(call KernelPackage,nft-nat6))
 
+
+
+define KernelPackage/ipt-weburl
+  SUBMENU:=$(NF_MENU)
+  TITLE:=weburl
+  KCONFIG:=CONFIG_IP_NF_MATCH_WEBURL
+  FILES:=$(LINUX_DIR)/net/ipv4/netfilter/*weburl*.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_WEBURL-m)))
+	DEPENDS:= kmod-ipt-core
+endef
+$(eval $(call KernelPackage,ipt-weburl))
+
+
+define KernelPackage/ipt-webmon
+  SUBMENU:=$(NF_MENU)
+  TITLE:=webmon
+  KCONFIG:=CONFIG_IP_NF_MATCH_WEBMON
+  FILES:=$(LINUX_DIR)/net/ipv4/netfilter/*webmon*.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_WEBMON-m)))
+	DEPENDS:= kmod-ipt-core
+endef
+$(eval $(call KernelPackage,ipt-webmon))
+
+
+define KernelPackage/ipt-timerange
+  SUBMENU:=$(NF_MENU)
+  TITLE:=timerange
+  KCONFIG:=CONFIG_IP_NF_MATCH_TIMERANGE
+  FILES:=$(LINUX_DIR)/net/ipv4/netfilter/*timerange*.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_TIMERANGE-m)))
+	DEPENDS:= kmod-ipt-core
+endef
+$(eval $(call KernelPackage,ipt-timerange))
+
+
+define KernelPackage/ipt-bandwidth
+  SUBMENU:=$(NF_MENU)
+  TITLE:=bandwidth
+  KCONFIG:=CONFIG_IP_NF_MATCH_BANDWIDTH
+  FILES:=$(LINUX_DIR)/net/ipv4/netfilter/*bandwidth*.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_BANDWIDTH-m)))
+	DEPENDS:= kmod-ipt-core
+endef
+$(eval $(call KernelPackage,ipt-bandwidth))

package/kernel/linux/modules/nls.mk

@@ -146,6 +146,20 @@ endef
 
 $(eval $(call KernelPackage,nls-cp932))
 
+define KernelPackage/nls-cp936
+  SUBMENU:=Native Language Support
+  TITLE:=Codepage 936 (GBK)
+  KCONFIG:=CONFIG_NLS_CODEPAGE_936
+  FILES:=$(LINUX_DIR)/fs/nls/nls_cp936.ko
+  AUTOLOAD:=$(call AutoLoad,25,nls_cp936)
+  $(call AddDepends/nls)
+endef
+
+define KernelPackage/nls-cp936/description
+  Kernel module for NLS Codepage 936 (GBK)
+endef
+
+$(eval $(call KernelPackage,nls-cp936))
 
 define KernelPackage/nls-cp1250
   SUBMENU:=Native Language Support

package/kernel/mac80211/files/lib/wifi/mac80211.sh

@@ -77,18 +77,18 @@ detect_mac80211() {
 		[ "$found" -gt 0 ] && continue
 
 		mode_band="g"
-		channel="11"
+		channel="auto"
 		htmode=""
 		ht_capab=""
 
-		iw phy "$dev" info | grep -q 'Capabilities:' && htmode=HT20
-		iw phy "$dev" info | grep -q '2412 MHz' || { mode_band="a"; channel="36"; }
+		iw phy "$dev" info | grep -q 'Capabilities:' && htmode=HT40
+		iw phy "$dev" info | grep -q '2412 MHz' || { mode_band="a"; channel="157"; }
 
 		vht_cap=$(iw phy "$dev" info | grep -c 'VHT Capabilities')
 		cap_5ghz=$(iw phy "$dev" info | grep -c "Band 2")
 		[ "$vht_cap" -gt 0 -a "$cap_5ghz" -gt 0 ] && {
 			mode_band="a";
-			channel="36"
+			channel="157"
 			htmode="VHT80"
 		}
 
@@ -109,22 +109,30 @@ detect_mac80211() {
 			dev_id="	option macaddr	$(cat /sys/class/ieee80211/${dev}/macaddress)"
 		fi
 
+		if [ x$mode_band == x"a" ]; then
+			ssid_5ghz="-5GHz"
+		else
+			ssid_5ghz="-2.4GHz"
+		fi
+
 		cat <<EOF
 config wifi-device  radio$devidx
 	option type     mac80211
 	option channel  ${channel}
 	option hwmode	11${mode_band}
 $dev_id
 $ht_capab
-	# REMOVE THIS LINE TO ENABLE WIFI:
-	option disabled 1
+	option noscan   1
+	option smps	0
+	option country CN
 
 config wifi-iface
 	option device   radio$devidx
 	option network  lan
 	option mode     ap
-	option ssid     OpenWrt
+	option ssid     OpenWrt${ssid_5ghz}-$(cat /sys/class/ieee80211/${dev}/macaddress | awk -F ":" '{print $4""$5""$6 }'| tr a-z A-Z)
 	option encryption none
+	option wds 1
 
 EOF
 	devidx=$(($devidx + 1))

package/kernel/mac80211/files/regdb.txt

@@ -251,10 +251,10 @@ country CL: DFS-JP
 	(5735 - 5835 @ 80), (20)
 
 country CN: DFS-FCC
-	(2402 - 2482 @ 40), (20)
-	(5170 - 5250 @ 80), (23), AUTO-BW
-	(5250 - 5330 @ 80), (23), DFS, AUTO-BW
-	(5735 - 5835 @ 80), (30)
+	(2402 - 2482 @ 40), (25)
+	(5170 - 5250 @ 80), (25), AUTO-BW
+	(5250 - 5330 @ 80), (25), DFS, AUTO-BW
+	(5735 - 5835 @ 80), (25)
 	# 60 GHz band channels 1,4: 28dBm, channels 2,3: 44dBm
 	# ref: http://www.miit.gov.cn/n11293472/n11505629/n11506593/n11960250/n11960606/n11960700/n12330791.files/n12330790.pdf
 	(57240 - 59400 @ 2160), (28)