From 38fa577990440a840221487de57a18eb853674e4 Mon Sep 17 00:00:00 2001
From: kimocoder <christianbremvaag@gmail.com>
Date: Wed, 4 Jul 2018 21:12:14 +0200
Subject: [PATCH] Fix ISO C90 warning on mixed declarations and/or code

---
 Makefile             |  2 +-
 README.md            | 38 +++++++++++++++++++-------------------
 hal/hal_com_phycfg.c |  3 ++-
 3 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/Makefile b/Makefile
index acebfa6..e0c3fb5 100755
--- a/Makefile
+++ b/Makefile
@@ -1894,7 +1894,7 @@ export CONFIG_RTL8812AU = m
 all: modules
 
 modules:
-	$(MAKE) -j $(shell nproc || echo 1) ARCH=$(ARCH) CROSS_COMPILE=$(CROSS_COMPILE) -C $(KSRC) M=$(shell pwd)  modules
+	$(MAKE) -j $(shell nproc || echo 1)  ARCH=$(ARCH) CROSS_COMPILE=$(CROSS_COMPILE) -C $(KSRC) M=$(shell pwd)  modules
 
 strip:
 	$(CROSS_COMPILE)strip $(MODULE_NAME).ko --strip-unneeded
diff --git a/README.md b/README.md
index cd7660d..d034b73 100644
--- a/README.md
+++ b/README.md
@@ -7,60 +7,60 @@ This driver supports 8812au & 8821au chipsets, not the 8814au chipset.
 ### Building / Installing
 
 To build and install module manually:
-```sh
+```
 $ "make" will build the 8812au, while "make RTL8821=1" will build the 8821au driver
-$ "sudo make install"
+$ sudo make install
 ```
 
 To use DKMS install:
 
-```sh
-$ "sudo ./dkms-install.sh"
+```
+$ sudo ./dkms-install.sh
 ```
 
 To use DKMS uninstall and remove:
 
-```sh
-$ "sudo ./dkms-remove.sh"
+```
+$ sudo ./dkms-remove.sh
 ```
 
 ### Notes
 Download
 ```
-"git clone -b v5.2.20 https://github.com/aircrack-ng/rtl8812au.git"
-"cd rtl*"
+git clone -b v5.2.20 https://github.com/aircrack-ng/rtl8812au.git
+cd rtl*
 ```
 Package / Build dependencies (Kali)
 ```
-"sudo apt-get install build-essential"
-"sudo apt-get install bc"
-"sudo apt-get install libelf-dev"
-"sudo apt-get install dkms"
-"sudo apt-get install linux-headers-`uname -r`"
+sudo apt-get install build-essential
+sudo apt-get install bc
+sudo apt-get install libelf-dev
+sudo apt-get install dkms
+sudo apt-get install linux-headers-`uname -r`
 ```
 Building for  Raspberry (RPI) also needs
 ```
-"sudo apt install raspberrypi-kernel-headers"
+sudo apt install raspberrypi-kernel-headers
 ```
 
 ### For setting monitor mode
 1. Fix problematic interference in monitor mode. 
 ```
-"airmon-ng check kill"
+airmon-ng check kill
 ```
 You may also uncheck the box "Automatically connect to this network when it is avaiable" in nm-connection-editor. This only works if you have a saved wifi connection.
 
 2. Set interface down
 ```
-"sudo ip link set wlan0 down"
+sudo ip link set wlan0 down
 ``` 
 3. Set monitor mode
 ```
-"sudo iw dev wlan0 set type monitor"
+sudo iw dev wlan0 set type monitor
 ```
 4. Set interface up
 ```
-"sudo ip link set wlan0 up"
+sudo ip link set wlan0 up
 ```
 
 ### LED control
@@ -102,4 +102,4 @@ wifi.scan-rand-mac-address=no
 ```
 at the end of file /etc/NetworkManager/NetworkManager.conf and restart NetworkManager with the command:
 ```
-"sudo service NetworkManager restart"
+sudo service NetworkManager restart
diff --git a/hal/hal_com_phycfg.c b/hal/hal_com_phycfg.c
index 5c3e95c..128cb2a 100644
--- a/hal/hal_com_phycfg.c
+++ b/hal/hal_com_phycfg.c
@@ -2725,6 +2725,7 @@ PHY_SetTxPowerIndexByRateArray(
 {
 	u32	powerIndex = 0;
 	int	i = 0;
+	struct txpwr_idx_comp tic;
 
 	for (i = 0; i < RateArraySize; ++i) {
 
@@ -2732,7 +2733,7 @@ PHY_SetTxPowerIndexByRateArray(
 			powerIndex = (u32)pAdapter->registrypriv.RegTxPowerIndexOverride;
 
 #if DBG_TX_POWER_IDX
-		struct txpwr_idx_comp tic;
+		//struct txpwr_idx_comp tic;
 		powerIndex = rtw_hal_get_tx_power_index(pAdapter, RFPath, Rates[i], BandWidth, Channel, &tic);
 		RTW_INFO("TXPWR: [%c][%s]ch:%u, %s %uT, pwr_idx:%d = %u + (%d=%d:%d) + (%d) + (%d)\n"
 			, rf_path_char(RFPath), ch_width_str(BandWidth), Channel, MGN_RATE_STR(Rates[i]), tic.ntx_idx + 1