wlan: Enhancement in Initial Forced Roam To 5G

. Make changes this Feature can coexist with
  Mocha 5G feature.
. Made this feature tightly coupled with the
  gEnableFirstScan2GOnly feature.
. Removed the gNeighborInitialForcedRoamTo5GhRssiDiff
  instead will use gSelect5GHzMargin ini item

Change-Id: I6a40d75c5457519dc9f156209ec34f0f00d68620
CRs-Fixed: 717916
diff --git a/CORE/SME/inc/csrInternal.h b/CORE/SME/inc/csrInternal.h
index a79e1e7..5c675ad 100644
--- a/CORE/SME/inc/csrInternal.h
+++ b/CORE/SME/inc/csrInternal.h
@@ -515,8 +515,7 @@
     tANI_U8        nMaxNeighborRetries;
     tANI_U16       nNeighborResultsRefreshPeriod;
     tANI_U16       nEmptyScanRefreshPeriod;
-    tANI_U8        nNeighborInitialForcedRoamTo5GhEnable;//below RssiDiff will be meaningful only when enable is set to 1
-    tANI_U8        nNeighborInitialForcedRoamTo5GhRssiDiff;
+    tANI_U8        nNeighborInitialForcedRoamTo5GhEnable;
 }tCsrNeighborRoamConfig;
 #endif