From 9e6fd2455cc418c5a3f1f9cb107c5dfad562bf4e Mon Sep 17 00:00:00 2001
From: kimocoder <christian@aircrack-ng.org>
Date: Thu, 19 Sep 2019 14:18:39 +0000
Subject: [PATCH] fix country setting and update vhc configure and rate fix
 (part 1)

---
 Makefile         | 7 +++++++
 core/rtw_debug.c | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index be54cef..f61b299 100755
--- a/Makefile
+++ b/Makefile
@@ -76,6 +76,8 @@ CONFIG_RTW_DEBUG = n
 CONFIG_RTW_LOG_LEVEL = 3
 CONFIG_USB_DEBUG = n
 #DEBUG=1
+######################### Enable Country Set ###############
+CONFIG_RTW_IOCTL_SET_COUNTRY = y
 ######################## Wake On Lan ##########################
 CONFIG_WOWLAN = n
 #bit2: deauth, bit1: unicast, bit0: magic pkt.
@@ -614,6 +616,11 @@ ifeq ($(CONFIG_RTW_DEBUG), y)
 EXTRA_CFLAGS += -DCONFIG_RTW_DEBUG
 EXTRA_CFLAGS += -DRTW_LOG_LEVEL=$(CONFIG_RTW_LOG_LEVEL)
 endif
+
+ifeq ($(CONFIG_RTW_IOCTL_SET_COUNTRY), y)
+EXTRA_CFLAGS += -DCONFIG_RTW_IOCTL_SET_COUNTRY
+endif
+
 EXTRA_CFLAGS += -DDM_ODM_SUPPORT_TYPE=0x04
 
 ifeq ($(CONFIG_PLATFORM_I386_PC), y)
diff --git a/core/rtw_debug.c b/core/rtw_debug.c
index 1a4d769..cd77769 100644
--- a/core/rtw_debug.c
+++ b/core/rtw_debug.c
@@ -5471,7 +5471,7 @@ int proc_get_monitor(struct seq_file *m, void *v)
 	_adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
 	struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
 
-	if (WIFI_MONITOR_STATE == get_fwstate(pmlmepriv)) {
+if (check_fwstate(pmlmepriv, WIFI_MONITOR_STATE) == _TRUE) {
 		RTW_PRINT_SEL(m, "Monitor mode : Enable\n");
 
 		RTW_PRINT_SEL(m, "ch=%d, ch_offset=%d, bw=%d\n",