(Reverting open source) Advertising proprietary IE (IBSS only)

Populating the prop IE (Oxygen network) in Beacon and
probe response frames sent by IBSS network only. An option is
provided in ini file to enable/disable populating the IE.

NOTE : Below CR is reverted with this gerrit
CRs-fixed: 509388
diff --git a/CORE/MAC/inc/wniCfgSta.h b/CORE/MAC/inc/wniCfgSta.h
index e8f4311..93a7b50 100644
--- a/CORE/MAC/inc/wniCfgSta.h
+++ b/CORE/MAC/inc/wniCfgSta.h
@@ -354,10 +354,9 @@
 #define WNI_CFG_TDLS_PUAPSD_INACT_TIME    300
 #define WNI_CFG_TDLS_RX_FRAME_THRESHOLD    301
 #define WNI_CFG_ENABLE_ADAPT_RX_DRAIN    302
-#define WNI_CFG_OXYGEN_NETWORK_DATA    303
-#define WNI_CFG_FLEX_CONNECT_POWER_FACTOR    304
-#define WNI_CFG_ANTENNA_DIVESITY    305
-#define WNI_CFG_GO_LINK_MONITOR_TIMEOUT    306
+#define WNI_CFG_FLEX_CONNECT_POWER_FACTOR    303
+#define WNI_CFG_ANTENNA_DIVESITY    304
+#define WNI_CFG_GO_LINK_MONITOR_TIMEOUT    305
 
 /*
  * String parameter lengths 
@@ -1652,10 +1651,6 @@
 #define WNI_CFG_ENABLE_ADAPT_RX_DRAIN_STAMAX    1
 #define WNI_CFG_ENABLE_ADAPT_RX_DRAIN_STADEF    1
 
-#define WNI_CFG_OXYGEN_NETWORK_DATA_STAMIN    0
-#define WNI_CFG_OXYGEN_NETWORK_DATA_STAMAX    8192
-#define WNI_CFG_OXYGEN_NETWORK_DATA_STADEF    8192
-
 #define WNI_CFG_FLEX_CONNECT_POWER_FACTOR_STAMIN    0
 #define WNI_CFG_FLEX_CONNECT_POWER_FACTOR_STAMAX    9
 #define WNI_CFG_FLEX_CONNECT_POWER_FACTOR_STADEF    0
@@ -1668,8 +1663,8 @@
 #define WNI_CFG_GO_LINK_MONITOR_TIMEOUT_STAMAX    50
 #define WNI_CFG_GO_LINK_MONITOR_TIMEOUT_STADEF    10
 
-#define CFG_PARAM_MAX_NUM        307
-#define CFG_STA_IBUF_MAX_SIZE    241
+#define CFG_PARAM_MAX_NUM        306
+#define CFG_STA_IBUF_MAX_SIZE    240
 #define CFG_STA_SBUF_MAX_SIZE    3388
 #define CFG_SEM_MAX_NUM          19