wlan: (2)Decouple init scan and NOA insert in P2P GO case

Currently we have scan req coupled with NOA publishing for GO. This
blocks our MLME state to scan state for 3 beacon intervals which causes
1) Huge Throughput dip during scan since we suspend TL for 3 BIs
2) Sometimes connection problems since we are in scan state for longer
time though we are not doing scan (for 3 BIs) esp. since some frames get
delayed on both and client and GO sides during scan because of current
implementation.
So the change is decouple publishing of NOA from scan in a way that
while we wait for NOA publishing for 3 BIs we can do all other jobs at
lim module and below. Also, we will be suspending TL only when we are
actually doing scan
3) Changed the BIs for which NOA is published to 2 instead of 3

Change-Id: Id8f2db8019e132183f671aa4aa80d8dfdfe05f97
CR-Fixed: 426949
(cherry picked from commit d86bde28085c661638a4f46cb660ca00851d3497)
diff --git a/CORE/SME/inc/p2p_Api.h b/CORE/SME/inc/p2p_Api.h
index 6cfea72..00eb7e6 100644
--- a/CORE/SME/inc/p2p_Api.h
+++ b/CORE/SME/inc/p2p_Api.h
@@ -62,6 +62,11 @@
 #define SIZE_OF_NOA_DESCRIPTOR 13
 #define MAX_NOA_PERIOD_IN_MICROSECS 3000000
 
+#define P2P_CLEAR_POWERSAVE 0
+#define P2P_OPPORTUNISTIC_PS 1
+#define P2P_PERIODIC_NOA 2
+#define P2P_SINGLE_NOA 4
+
 #ifdef WLAN_FEATURE_P2P_INTERNAL
 
 #define MAX_SOCIAL_CHANNELS 3
@@ -78,12 +83,6 @@
 #define ACTION_FRAME_RETRY_TIMEOUT 50
 #define P2P_COUNTRY_CODE_LEN 3
 
-#define P2P_CLEAR_POWERSAVE 0
-#define P2P_OPPORTUNISTIC_PS 1
-#define P2P_PERIODIC_NOA 2
-#define P2P_SINGLE_NOA 4
-
-
 /* Wi-Fi Direct Device Discovery Type */
 typedef enum ep2pDiscoverType {
    /** Driver must perform device discovery only using the scan phase*/