commit 01e5b07f16ad7a7cca9e18f7fb39cdda6d391f19
author guo-jie.wang <guo-jie.wang@mediatek.com> Tue Nov 28 17:45:45 2017 +0800
committer Guo-Jie Wang <guo-jie.wang@mediatek.com> Wed Nov 29 10:25:46 2017 +0800
tree fb3d57eb30e54ce904c9a9fef9ef4b7ab8edbc93
parent 531d93ad3add58d096a424109c93798cd28e9c57

[WCNCR00166796] sniffer: fix coding error

[Description]
Fix coding error
Should enclose sniffer mode code with fgIsEnableMon

Change-Id: Ia9f57a32fe3adc7fcc6d09f3e9e444fcb6bc6aee
CR-Id: WCNCR00166796
Feature: sniffer
Signed-off-by: guo-jie.wang <guo-jie.wang@mediatek.com>

nic/nic_rx.c

diff --git a/nic/nic_rx.c b/nic/nic_rx.c
index 1dca538..8295378 100644
--- a/nic/nic_rx.c
+++ b/nic/nic_rx.c
@@ -2758,14 +2758,15 @@
 				switch (prSwRfb->ucPacketType) {
 				case RX_PKT_TYPE_RX_DATA:
 #if CFG_SUPPORT_SNIFFER
-					if (HAL_IS_RX_DIRECT(prAdapter)) {
+					if (prAdapter->prGlueInfo->fgIsEnableMon && HAL_IS_RX_DIRECT(prAdapter)) {
 						spin_lock_bh(&prAdapter->prGlueInfo->rSpinLock[SPIN_LOCK_RX_DIRECT]);
 						nicRxProcessMonitorPacket(prAdapter, prSwRfb);
 						spin_unlock_bh(&prAdapter->prGlueInfo->rSpinLock[SPIN_LOCK_RX_DIRECT]);
-					} else {
+						break;
+					} else if (prAdapter->prGlueInfo->fgIsEnableMon) {
 						nicRxProcessMonitorPacket(prAdapter, prSwRfb);
+						break;
 					}
-					break;
 #endif
 					if (HAL_IS_RX_DIRECT(prAdapter)) {
 						spin_lock_bh(&prAdapter->prGlueInfo->rSpinLock[SPIN_LOCK_RX_DIRECT]);

os/linux/hif/usb/hal_api.c

diff --git a/os/linux/hif/usb/hal_api.c b/os/linux/hif/usb/hal_api.c
index aaa6b8f..a06b909 100644
--- a/os/linux/hif/usb/hal_api.c
+++ b/os/linux/hif/usb/hal_api.c
@@ -755,7 +755,9 @@
 				case RX_PKT_TYPE_RX_DATA:
 #if CFG_SUPPORT_SNIFFER
 					if (prGlueInfo->fgIsEnableMon) {
+						spin_lock_bh(&prGlueInfo->rSpinLock[SPIN_LOCK_RX_DIRECT]);
 						nicRxProcessMonitorPacket(prAdapter, prSwRfb);
+						spin_unlock_bh(&prGlueInfo->rSpinLock[SPIN_LOCK_RX_DIRECT]);
 						break;
 					}
 #endif