diff --git a/Makefile b/Makefile
index dae3e2b..6e3b8ff 100755
--- a/Makefile
+++ b/Makefile
@@ -1,38 +1,30 @@
 EXTRA_CFLAGS += $(USER_EXTRA_CFLAGS) -fno-pie
 EXTRA_CFLAGS += -O1
-#EXTRA_CFLAGS += -O3
-#EXTRA_CFLAGS += -Wall
-#EXTRA_CFLAGS += -Wextra
-#EXTRA_CFLAGS += -Werror
-#EXTRA_CFLAGS += -pedantic
-#EXTRA_CFLAGS += -Wshadow -Wpointer-arith -Wcast-qual -Wstrict-prototypes -Wmissing-prototypes
 EXTRA_CFLAGS += -Wno-unused-variable
 EXTRA_CFLAGS += -Wno-unused-value
 EXTRA_CFLAGS += -Wno-unused-label
 EXTRA_CFLAGS += -Wno-unused-parameter
 EXTRA_CFLAGS += -Wno-unused-function
 EXTRA_CFLAGS += -Wno-unused
-EXTRA_CFLAGS += -Wno-date-time
 EXTRA_CFLAGS += -Wno-uninitialized
 EXTRA_CFLAGS += -Wno-cast-function-type
 EXTRA_CFLAGS += -Wno-misleading-indentation
 EXTRA_CFLAGS += -Wno-missing-field-initializers
-#EXTRA_CFLAGS += -Wimplicit-fallthrough
+EXTRA_CFLAGS += -Wimplicit-fallthrough
 EXTRA_CFLAGS += -Wno-vla -g
-#EXTRA_CFLAGS += -Wno-tautological-compare
-#EXTRA_CFLAGS += -Wno-incompatible-pointer-types
-#EXTRA_CFLAGS += -Wsign-conversion
+EXTRA_CFLAGS += -Wno-tautological-compare
+EXTRA_CFLAGS += -Wno-incompatible-pointer-types
+EXTRA_CFLAGS += -Wsign-conversion
 # Relax some warnings from '-Wextra' so we won't get flooded with warnings
-#EXTRA_CFLAGS += -Wno-sign-compare -Wno-sign-conversion
-#EXTRA_CFLAGS += -Wno-type-limits
+EXTRA_CFLAGS += -Wno-sign-compare -Wno-sign-conversion
+EXTRA_CFLAGS += -Wno-type-limits
 
-GCC_VER_49 := $(shell echo `$(CC) -dumpversion | cut -f1-2 -d.` \>= 4.9 | bc )
-ifeq ($(GCC_VER_49),1)
+#GCC_VER_49 := $(shell echo `$(CC) -dumpversion | cut -f1-2 -d.` \>= 4.9 | bc )
+#ifeq ($(GCC_VER_49),1)
 EXTRA_CFLAGS += -Wno-date-time	# Fix compile error && warning on gcc 4.9 and later
-endif
+#endif
 
 EXTRA_CFLAGS += -I$(src)/include
-
 EXTRA_LDFLAGS += --strip-debug
 
 ########################## WIFI IC ############################
diff --git a/dkms.conf b/dkms.conf
index 23b680a..62b61b9 100644
--- a/dkms.conf
+++ b/dkms.conf
@@ -1,5 +1,5 @@
 PACKAGE_NAME="realtek-rtl88xxau"
-PACKAGE_VERSION="5.6.4.2~20191118"
+PACKAGE_VERSION="5.6.4.2~20191216"
 CLEAN="'make' clean"
 BUILT_MODULE_NAME[0]=88XXau
 PROCS_NUM=`nproc`
diff --git a/include/rtl_autoconf.h b/include/rtl_autoconf.h
index a41c662..87762b2 100644
--- a/include/rtl_autoconf.h
+++ b/include/rtl_autoconf.h
@@ -22,16 +22,17 @@
  */
 #define AUTOCONF_INCLUDED
 #define RTL871X_MODULE_NAME "8812AU"
+
+/*
 #ifndef DRV_NAME
 #define DRV_NAME "rtl8812au"
 #endif
+*/
 
 #define CONFIG_USB_HCI
 
 #define PLATFORM_LINUX
 
-#define CONFIG_IOCTL_CFG80211 1
-
 #ifdef CONFIG_IOCTL_CFG80211
 	/* #define RTW_USE_CFG80211_STA_EVENT */ /* Indecate new sta asoc through cfg80211_new_sta */
 	#define CONFIG_CFG80211_FORCE_COMPATIBLE_2_6_37_UNDER
@@ -58,6 +59,7 @@
 #endif
 
 #define CONFIG_80211N_HT
+
 #define CONFIG_80211AC_VHT
 #ifdef CONFIG_80211AC_VHT
 	#ifndef CONFIG_80211N_HT
@@ -83,7 +85,7 @@
 
 #define CONFIG_RECV_REORDERING_CTRL	1
 
-#define CONFIG_DFS	1
+#define CONFIG_DFS	0
 
  /* #define CONFIG_SUPPORT_USB_INT */
  #ifdef CONFIG_SUPPORT_USB_INT
@@ -179,8 +181,7 @@
 	#define CONFIG_TDLS_CH_SW	/* Enable this flag only when we confirm that TDLS CH SW is supported in FW */
 #endif
 
-
-#define CONFIG_SKB_COPY	1/* for amsdu */
+#define CONFIG_SKB_COPY	1 /* for amsdu */
 
 #define CONFIG_RTW_LED
 #ifdef CONFIG_RTW_LED
@@ -324,7 +325,7 @@
 /*
  * Debug Related Config
  */
-#define DBG	1
+#define DBG	0
 
 #define CONFIG_PROC_DEBUG
 
@@ -347,7 +348,9 @@
 /* #define DBG_RX_SIGNAL_DISPLAY_PROCESSING */
 /* #define DBG_RX_SIGNAL_DISPLAY_SSID_MONITORED "jeff-ap" */
 
-
+#define DBG_TX_POWER_IDX 1
+#define DBG_PG_TXPWR_READ 1
+#define DBG_HIGHEST_RATE_BMP_BW_CHANGE 1
 
 /* #define DBG_SHOW_MCUFWDL_BEFORE_51_ENABLE */
 /* #define DBG_ROAMING_TEST */