qcacld-2.0: Remove the 4.9 GHZ channels

qcacld-3.0 to qcacld-2.0 propagation

Remove the 4.9 GHZ channels from the driver stack.
4.9 GHZ channels are not being used for any country,
so remove them.

Change-Id: I135f997bb4c8ad7a536596b4e89eb037f41e0c73
CRs-Fixed: 1001658

6 files changed, 3 insertions, 203 deletions

diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index c07201e23e5c..a44b1619f409 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -270,13 +270,6 @@ static struct ieee80211_channel hdd_social_channels_2_4_GHZ[] =
 
 const static struct ieee80211_channel hdd_channels_5_GHZ[] =
 {
-    HDD5GHZCHAN(4920, 184, 0) ,
-    HDD5GHZCHAN(4940, 188, 0) ,
-    HDD5GHZCHAN(4960, 192, 0) ,
-    HDD5GHZCHAN(4980, 196, 0) ,
-    HDD5GHZCHAN(5040, 8, 0) ,
-    HDD5GHZCHAN(5060, 12, 0) ,
-    HDD5GHZCHAN(5080, 16, 0) ,
     HDD5GHZCHAN(5180, 36, 0) ,
     HDD5GHZCHAN(5200, 40, 0) ,
     HDD5GHZCHAN(5220, 44, 0) ,
diff --git a/CORE/HDD/src/wlan_hdd_wext.c b/CORE/HDD/src/wlan_hdd_wext.c
index 0a6cf6f5424d..f89ae2b972b6 100644
--- a/CORE/HDD/src/wlan_hdd_wext.c
+++ b/CORE/HDD/src/wlan_hdd_wext.c
@@ -122,8 +122,7 @@ module_param(ioctl_debug, int, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
 static const hdd_freq_chan_map_t freq_chan_map[] = { {2412, 1}, {2417, 2},
         {2422, 3}, {2427, 4}, {2432, 5}, {2437, 6}, {2442, 7}, {2447, 8},
         {2452, 9}, {2457, 10}, {2462, 11}, {2467 ,12}, {2472, 13},
-        {2484, 14}, {4920, 240}, {4940, 244}, {4960, 248}, {4980, 252},
-        {5040, 208}, {5060, 212}, {5080, 216}, {5180, 36}, {5200, 40}, {5220, 44},
+        {2484, 14}, {5180, 36}, {5200, 40}, {5220, 44},
         {5240, 48}, {5260, 52}, {5280, 56}, {5300, 60}, {5320, 64}, {5500, 100},
         {5520, 104}, {5540, 108}, {5560, 112}, {5580, 116}, {5600, 120},
         {5620, 124}, {5640, 128}, {5660, 132}, {5680, 136}, {5700, 140},
diff --git a/CORE/SAP/src/sapChSelect.c b/CORE/SAP/src/sapChSelect.c
index 16463d6e0d06..ac74e57c6100 100644
--- a/CORE/SAP/src/sapChSelect.c
+++ b/CORE/SAP/src/sapChSelect.c
@@ -114,13 +114,6 @@ sapSafeChannelType safeChannels[NUM_20MHZ_RF_CHANNELS] =
     {12 , VOS_TRUE},      //RF_CHAN_12,
     {13 , VOS_TRUE},      //RF_CHAN_13,
     {14 , VOS_TRUE},      //RF_CHAN_14,
-    {240, VOS_TRUE},      //RF_CHAN_240,
-    {244, VOS_TRUE},      //RF_CHAN_244,
-    {248, VOS_TRUE},      //RF_CHAN_248,
-    {252, VOS_TRUE},      //RF_CHAN_252,
-    {208, VOS_TRUE},      //RF_CHAN_208,
-    {212, VOS_TRUE},      //RF_CHAN_212,
-    {216, VOS_TRUE},      //RF_CHAN_216,
     {36 , VOS_TRUE},      //RF_CHAN_36,
     {40 , VOS_TRUE},      //RF_CHAN_40,
     {44 , VOS_TRUE},      //RF_CHAN_44,
diff --git a/CORE/SERVICES/WMA/wlan_nv.c b/CORE/SERVICES/WMA/wlan_nv.c
index 14342c18cafb..7ddde665c47f 100644
--- a/CORE/SERVICES/WMA/wlan_nv.c
+++ b/CORE/SERVICES/WMA/wlan_nv.c
@@ -857,15 +857,6 @@ const sHalNv nvDefaults =
                     {NV_CHANNEL_DISABLE, 30},           //RF_CHAN_13,
                     {NV_CHANNEL_DISABLE, 30},           //RF_CHAN_14,
 
-                    //4.9GHz Band, none CB
-                    {NV_CHANNEL_DISABLE, 23},            //RF_CHAN_240,
-                    {NV_CHANNEL_DISABLE, 23},            //RF_CHAN_244,
-                    {NV_CHANNEL_DISABLE, 23},            //RF_CHAN_248,
-                    {NV_CHANNEL_DISABLE, 23},            //RF_CHAN_252,
-                    {NV_CHANNEL_DISABLE, 23},            //RF_CHAN_208,
-                    {NV_CHANNEL_DISABLE, 23},            //RF_CHAN_212,
-                    {NV_CHANNEL_DISABLE, 23},            //RF_CHAN_216,
-
                     //5GHz Low & Mid U-NII Band, none CB
                     {NV_CHANNEL_ENABLE, 17},             //RF_CHAN_36,
                     {NV_CHANNEL_ENABLE, 17},             //RF_CHAN_40,
@@ -924,13 +915,6 @@ const sHalNv nvDefaults =
                     {NV_CHANNEL_ENABLE, 0},            //RF_CHAN_BOND_10,
                     {NV_CHANNEL_ENABLE, 0},            //RF_CHAN_BOND_11,
 
-                    // 4.9GHz Band, channel bonded channels
-                    {NV_CHANNEL_DISABLE, 0},            //RF_CHAN_BOND_242,
-                    {NV_CHANNEL_DISABLE, 0},            //RF_CHAN_BOND_246,
-                    {NV_CHANNEL_DISABLE, 0},            //RF_CHAN_BOND_250,
-                    {NV_CHANNEL_DISABLE, 0},            //RF_CHAN_BOND_210,
-                    {NV_CHANNEL_DISABLE, 0},            //RF_CHAN_BOND_214,
-
                     //5GHz Low & Mid U-NII Band, channel bonded channels
                     {NV_CHANNEL_ENABLE, 20},            //RF_CHAN_BOND_38,
                     {NV_CHANNEL_ENABLE, 20},            //RF_CHAN_BOND_42,
@@ -1023,15 +1007,6 @@ const sHalNv nvDefaults =
                     {NV_CHANNEL_ENABLE, 19},           //RF_CHAN_13,
                     {NV_CHANNEL_DISABLE, 0},           //RF_CHAN_14,
 
-                    //4.9GHz Band, none CB
-                    {NV_CHANNEL_DISABLE, 0},            //RF_CHAN_240,
-                    {NV_CHANNEL_DISABLE, 0},            //RF_CHAN_244,
-                    {NV_CHANNEL_DISABLE, 0},            //RF_CHAN_248,
-                    {NV_CHANNEL_DISABLE, 0},            //RF_CHAN_252,
-                    {NV_CHANNEL_DISABLE, 0},            //RF_CHAN_208,
-                    {NV_CHANNEL_DISABLE, 0},            //RF_CHAN_212,
-                    {NV_CHANNEL_DISABLE, 0},            //RF_CHAN_216,
-
                     //5GHz Low & Mid U-NII Band, none CB
                     {NV_CHANNEL_ENABLE, 23},            //RF_CHAN_36,
                     {NV_CHANNEL_ENABLE, 23},            //RF_CHAN_40,
@@ -1090,13 +1065,6 @@ const sHalNv nvDefaults =
                     {NV_CHANNEL_ENABLE, 20},            //RF_CHAN_BOND_10,
                     {NV_CHANNEL_ENABLE, 20},            //RF_CHAN_BOND_11,
 
-                    // 4.9GHz Band, channel bonded channels
-                    {NV_CHANNEL_DISABLE, 0},            //RF_CHAN_BOND_242,
-                    {NV_CHANNEL_DISABLE, 0},            //RF_CHAN_BOND_246,
-                    {NV_CHANNEL_DISABLE, 0},            //RF_CHAN_BOND_250,
-                    {NV_CHANNEL_DISABLE, 0},            //RF_CHAN_BOND_210,
-                    {NV_CHANNEL_DISABLE, 0},            //RF_CHAN_BOND_214,
-
                     //5GHz Low & Mid U-NII Band, channel bonded channels
                     {NV_CHANNEL_ENABLE, 23},            //RF_CHAN_BOND_38,
                     {NV_CHANNEL_ENABLE, 23},            //RF_CHAN_BOND_42,
@@ -1189,15 +1157,6 @@ const sHalNv nvDefaults =
                     {NV_CHANNEL_ENABLE, 20},           //RF_CHAN_13,
                     {NV_CHANNEL_ENABLE, 18},           //RF_CHAN_14,
 
-                    //4.9GHz Band, none CB
-                    {NV_CHANNEL_DISABLE, 23},            //RF_CHAN_240,
-                    {NV_CHANNEL_DISABLE, 23},            //RF_CHAN_244,
-                    {NV_CHANNEL_DISABLE, 23},            //RF_CHAN_248,
-                    {NV_CHANNEL_DISABLE, 23},            //RF_CHAN_252,
-                    {NV_CHANNEL_DISABLE, 23},            //RF_CHAN_208,
-                    {NV_CHANNEL_DISABLE, 23},            //RF_CHAN_212,
-                    {NV_CHANNEL_DISABLE, 23},            //RF_CHAN_216,
-
                     //5GHz Low & Mid U-NII Band, none CB
                     {NV_CHANNEL_ENABLE, 17},            //RF_CHAN_36,
                     {NV_CHANNEL_ENABLE, 17},            //RF_CHAN_40,
@@ -1239,13 +1198,6 @@ const sHalNv nvDefaults =
                     {NV_CHANNEL_ENABLE, 0},            //RF_CHAN_BOND_10,
                     {NV_CHANNEL_ENABLE, 0},            //RF_CHAN_BOND_11,
 
-                    // 4.9GHz Band, channel bonded channels
-                    {NV_CHANNEL_DISABLE, 0},            //RF_CHAN_BOND_242,
-                    {NV_CHANNEL_DISABLE, 0},            //RF_CHAN_BOND_246,
-                    {NV_CHANNEL_DISABLE, 0},            //RF_CHAN_BOND_250,
-                    {NV_CHANNEL_DISABLE, 0},            //RF_CHAN_BOND_210,
-                    {NV_CHANNEL_DISABLE, 0},            //RF_CHAN_BOND_214,
-
                     //5GHz Low & Mid U-NII Band, channel bonded channels
                     {NV_CHANNEL_ENABLE, 20},            //RF_CHAN_BOND_38,
                     {NV_CHANNEL_ENABLE, 20},            //RF_CHAN_BOND_42,
@@ -1338,15 +1290,6 @@ const sHalNv nvDefaults =
                     {NV_CHANNEL_ENABLE, 16},           //RF_CHAN_13,
                     {NV_CHANNEL_DISABLE, 0},           //RF_CHAN_14,
 
-                    //4.9GHz Band, none CB
-                    {NV_CHANNEL_DISABLE, 23},            //RF_CHAN_240,
-                    {NV_CHANNEL_DISABLE, 23},            //RF_CHAN_244,
-                    {NV_CHANNEL_DISABLE, 23},            //RF_CHAN_248,
-                    {NV_CHANNEL_DISABLE, 23},            //RF_CHAN_252,
-                    {NV_CHANNEL_DISABLE, 23},            //RF_CHAN_208,
-                    {NV_CHANNEL_DISABLE, 23},            //RF_CHAN_212,
-                    {NV_CHANNEL_DISABLE, 23},            //RF_CHAN_216,
-
                     //5GHz Low & Mid U-NII Band, none CB
                     {NV_CHANNEL_ENABLE, 17},            //RF_CHAN_36,
                     {NV_CHANNEL_ENABLE, 17},            //RF_CHAN_40,
@@ -1388,13 +1331,6 @@ const sHalNv nvDefaults =
                     {NV_CHANNEL_ENABLE, 0},            //RF_CHAN_BOND_10,
                     {NV_CHANNEL_ENABLE, 0},            //RF_CHAN_BOND_11,
 
-                    // 4.9GHz Band, channel bonded channels
-                    {NV_CHANNEL_DISABLE, 0},            //RF_CHAN_BOND_242,
-                    {NV_CHANNEL_DISABLE, 0},            //RF_CHAN_BOND_246,
-                    {NV_CHANNEL_DISABLE, 0},            //RF_CHAN_BOND_250,
-                    {NV_CHANNEL_DISABLE, 0},            //RF_CHAN_BOND_210,
-                    {NV_CHANNEL_DISABLE, 0},            //RF_CHAN_BOND_214,
-
                     //5GHz Low & Mid U-NII Band, channel bonded channels
                     {NV_CHANNEL_ENABLE, 20},            //RF_CHAN_BOND_38,
                     {NV_CHANNEL_ENABLE, 20},            //RF_CHAN_BOND_42,
@@ -1487,15 +1423,6 @@ const sHalNv nvDefaults =
                     {NV_CHANNEL_DISABLE, 30},           //RF_CHAN_13,
                     {NV_CHANNEL_DISABLE, 30},           //RF_CHAN_14,
 
-                    //4.9GHz Band, none CB
-                    {NV_CHANNEL_DISABLE, 23},            //RF_CHAN_240,
-                    {NV_CHANNEL_DISABLE, 23},            //RF_CHAN_244,
-                    {NV_CHANNEL_DISABLE, 23},            //RF_CHAN_248,
-                    {NV_CHANNEL_DISABLE, 23},            //RF_CHAN_252,
-                    {NV_CHANNEL_DISABLE, 23},            //RF_CHAN_208,
-                    {NV_CHANNEL_DISABLE, 23},            //RF_CHAN_212,
-                    {NV_CHANNEL_DISABLE, 23},            //RF_CHAN_216,
-
                     //5GHz Low & Mid U-NII Band, none CB
                     {NV_CHANNEL_ENABLE, 17},            //RF_CHAN_36,
                     {NV_CHANNEL_ENABLE, 17},            //RF_CHAN_40,
@@ -1537,13 +1464,6 @@ const sHalNv nvDefaults =
                     {NV_CHANNEL_ENABLE, 0},            //RF_CHAN_BOND_10,
                     {NV_CHANNEL_ENABLE, 0},            //RF_CHAN_BOND_11,
 
-                    // 4.9GHz Band, channel bonded channels
-                    {NV_CHANNEL_DISABLE, 0},            //RF_CHAN_BOND_242,
-                    {NV_CHANNEL_DISABLE, 0},            //RF_CHAN_BOND_246,
-                    {NV_CHANNEL_DISABLE, 0},            //RF_CHAN_BOND_250,
-                    {NV_CHANNEL_DISABLE, 0},            //RF_CHAN_BOND_210,
-                    {NV_CHANNEL_DISABLE, 0},            //RF_CHAN_BOND_214,
-
                     //5GHz Low & Mid U-NII Band, channel bonded channels
                     {NV_CHANNEL_ENABLE, 20},            //RF_CHAN_BOND_38,
                     {NV_CHANNEL_ENABLE, 20},            //RF_CHAN_BOND_42,
@@ -1636,15 +1556,6 @@ const sHalNv nvDefaults =
                     {NV_CHANNEL_ENABLE, 16},           //RF_CHAN_13,
                     {NV_CHANNEL_DISABLE, 0},           //RF_CHAN_14,
 
-                    //4.9GHz Band, none CB
-                    {NV_CHANNEL_DISABLE, 23},            //RF_CHAN_240,
-                    {NV_CHANNEL_DISABLE, 23},            //RF_CHAN_244,
-                    {NV_CHANNEL_DISABLE, 23},            //RF_CHAN_248,
-                    {NV_CHANNEL_DISABLE, 23},            //RF_CHAN_252,
-                    {NV_CHANNEL_DISABLE, 23},            //RF_CHAN_208,
-                    {NV_CHANNEL_DISABLE, 23},            //RF_CHAN_212,
-                    {NV_CHANNEL_DISABLE, 23},            //RF_CHAN_216,
-
                     //5GHz Low & Mid U-NII Band, none CB
                     {NV_CHANNEL_ENABLE, 17},            //RF_CHAN_36,
                     {NV_CHANNEL_ENABLE, 17},            //RF_CHAN_40,
@@ -1686,13 +1597,6 @@ const sHalNv nvDefaults =
                     {NV_CHANNEL_ENABLE, 0},            //RF_CHAN_BOND_10,
                     {NV_CHANNEL_ENABLE, 0},            //RF_CHAN_BOND_11,
 
-                    // 4.9GHz Band, channel bonded channels
-                    {NV_CHANNEL_DISABLE, 0},            //RF_CHAN_BOND_242,
-                    {NV_CHANNEL_DISABLE, 0},            //RF_CHAN_BOND_246,
-                    {NV_CHANNEL_DISABLE, 0},            //RF_CHAN_BOND_250,
-                    {NV_CHANNEL_DISABLE, 0},            //RF_CHAN_BOND_210,
-                    {NV_CHANNEL_DISABLE, 0},            //RF_CHAN_BOND_214,
-
                     //5GHz Low & Mid U-NII Band, channel bonded channels
                     {NV_CHANNEL_ENABLE, 20},            //RF_CHAN_BOND_38,
                     {NV_CHANNEL_ENABLE, 20},            //RF_CHAN_BOND_42,
@@ -1785,15 +1689,6 @@ const sHalNv nvDefaults =
                     {NV_CHANNEL_ENABLE, 15},           //RF_CHAN_13,
                     {NV_CHANNEL_DISABLE, 0},           //RF_CHAN_14,
 
-                    //4.9GHz Band, none CB
-                    {NV_CHANNEL_DISABLE, 23},            //RF_CHAN_240,
-                    {NV_CHANNEL_DISABLE, 23},            //RF_CHAN_244,
-                    {NV_CHANNEL_DISABLE, 23},            //RF_CHAN_248,
-                    {NV_CHANNEL_DISABLE, 23},            //RF_CHAN_252,
-                    {NV_CHANNEL_DISABLE, 23},            //RF_CHAN_208,
-                    {NV_CHANNEL_DISABLE, 23},            //RF_CHAN_212,
-                    {NV_CHANNEL_DISABLE, 23},            //RF_CHAN_216,
-
                     //5GHz Low & Mid U-NII Band, none CB
                     {NV_CHANNEL_ENABLE, 17},            //RF_CHAN_36,
                     {NV_CHANNEL_ENABLE, 17},            //RF_CHAN_40,
@@ -1835,13 +1730,6 @@ const sHalNv nvDefaults =
                     {NV_CHANNEL_ENABLE, 0},            //RF_CHAN_BOND_10,
                     {NV_CHANNEL_ENABLE, 0},            //RF_CHAN_BOND_11,
 
-                    // 4.9GHz Band, channel bonded channels
-                    {NV_CHANNEL_DISABLE, 0},            //RF_CHAN_BOND_242,
-                    {NV_CHANNEL_DISABLE, 0},            //RF_CHAN_BOND_246,
-                    {NV_CHANNEL_DISABLE, 0},            //RF_CHAN_BOND_250,
-                    {NV_CHANNEL_DISABLE, 0},            //RF_CHAN_BOND_210,
-                    {NV_CHANNEL_DISABLE, 0},            //RF_CHAN_BOND_214,
-
                     //5GHz Low & Mid U-NII Band, channel bonded channels
                     {NV_CHANNEL_ENABLE, 20},            //RF_CHAN_BOND_38,
                     {NV_CHANNEL_ENABLE, 20},            //RF_CHAN_BOND_42,
@@ -1934,15 +1822,6 @@ const sHalNv nvDefaults =
                     {NV_CHANNEL_ENABLE, 14},           //RF_CHAN_13,
                     {NV_CHANNEL_DISABLE, 0},           //RF_CHAN_14,
 
-                    //4.9GHz Band, none CB
-                    {NV_CHANNEL_DISABLE, 23},            //RF_CHAN_240,
-                    {NV_CHANNEL_DISABLE, 23},            //RF_CHAN_244,
-                    {NV_CHANNEL_DISABLE, 23},            //RF_CHAN_248,
-                    {NV_CHANNEL_DISABLE, 23},            //RF_CHAN_252,
-                    {NV_CHANNEL_DISABLE, 23},            //RF_CHAN_208,
-                    {NV_CHANNEL_DISABLE, 23},            //RF_CHAN_212,
-                    {NV_CHANNEL_DISABLE, 23},            //RF_CHAN_216,
-
                     //5GHz Low & Mid U-NII Band, none CB
                     {NV_CHANNEL_ENABLE, 17},            //RF_CHAN_36,
                     {NV_CHANNEL_ENABLE, 17},            //RF_CHAN_40,
@@ -1984,13 +1863,6 @@ const sHalNv nvDefaults =
                     {NV_CHANNEL_ENABLE, 0},            //RF_CHAN_BOND_10,
                     {NV_CHANNEL_ENABLE, 0},            //RF_CHAN_BOND_11,
 
-                    // 4.9GHz Band, channel bonded channels
-                    {NV_CHANNEL_DISABLE, 0},            //RF_CHAN_BOND_242,
-                    {NV_CHANNEL_DISABLE, 0},            //RF_CHAN_BOND_246,
-                    {NV_CHANNEL_DISABLE, 0},            //RF_CHAN_BOND_250,
-                    {NV_CHANNEL_DISABLE, 0},            //RF_CHAN_BOND_210,
-                    {NV_CHANNEL_DISABLE, 0},            //RF_CHAN_BOND_214,
-
                     //5GHz Low & Mid U-NII Band, channel bonded channels
                     {NV_CHANNEL_ENABLE, 20},            //RF_CHAN_BOND_38,
                     {NV_CHANNEL_ENABLE, 20},            //RF_CHAN_BOND_42,
@@ -4023,13 +3895,6 @@ const sHalNv nvDefaults =
             95,  // RF_CHAN_12
             97,  // RF_CHAN_13
             104,   // RF_CHAN_14
-            100,   // RF_CHAN_240
-            100,   // RF_CHAN_244
-            100,   // RF_CHAN_248
-            100,   // RF_CHAN_252
-            100,   // RF_CHAN_208
-            100,   // RF_CHAN_212
-            100,   // RF_CHAN_216
             100,   // RF_CHAN_36
             100,   // RF_CHAN_40
             100,   // RF_CHAN_44
@@ -4064,11 +3929,6 @@ const sHalNv nvDefaults =
             100,   // RF_CHAN_BOND_9
             100,   // RF_CHAN_BOND_10
             100,   // RF_CHAN_BOND_11
-            100,   // RF_CHAN_BOND_242
-            100,   // RF_CHAN_BOND_246
-            100,   // RF_CHAN_BOND_250
-            100,   // RF_CHAN_BOND_210
-            100,   // RF_CHAN_BOND_214
             100,   // RF_CHAN_BOND_38
             100,   // RF_CHAN_BOND_42
             100,   // RF_CHAN_BOND_46
@@ -5317,13 +5177,6 @@ const sHalNv nvDefaults =
             310,  // RF_CHAN_12
             310,  // RF_CHAN_13
             310,   // RF_CHAN_14
-            280,  // RF_CHAN_240
-            280,  // RF_CHAN_244
-            280,   // RF_CHAN_248
-            280,   // RF_CHAN_252
-            280,   // RF_CHAN_208
-            280,   // RF_CHAN_212
-            280,   // RF_CHAN_216
             280,   // RF_CHAN_36
             280,   // RF_CHAN_40
             280,   // RF_CHAN_44
@@ -5358,11 +5211,6 @@ const sHalNv nvDefaults =
             280,   // RF_CHAN_BOND_9
             280,   // RF_CHAN_BOND_10
             280,   // RF_CHAN_BOND_11
-            280,   // RF_CHAN_BOND_242
-            280,   // RF_CHAN_BOND_246
-            280,   // RF_CHAN_BOND_250
-            280,   // RF_CHAN_BOND_210
-            280,   // RF_CHAN_BOND_214
             280,   // RF_CHAN_BOND_38
             280,   // RF_CHAN_BOND_42
             280,   // RF_CHAN_BOND_46
diff --git a/CORE/VOSS/src/vos_nvitem.c b/CORE/VOSS/src/vos_nvitem.c
index 9bc0671af3b8..493b1397eb1e 100644
--- a/CORE/VOSS/src/vos_nvitem.c
+++ b/CORE/VOSS/src/vos_nvitem.c
@@ -209,13 +209,6 @@ chan_to_ht_40_index_map chan_to_ht_40_index[NUM_20MHZ_RF_CHANNELS] =
   {RF_CHAN_BOND_10, INVALID_RF_CHANNEL},   //RF_CHAN_12,
   {RF_CHAN_BOND_11, INVALID_RF_CHANNEL},   //RF_CHAN_13,
   {INVALID_RF_CHANNEL, INVALID_RF_CHANNEL},//RF_CHAN_14,
-  {INVALID_RF_CHANNEL, RF_CHAN_BOND_242},  //RF_CHAN_240,
-  {RF_CHAN_BOND_242, RF_CHAN_BOND_246},    //RF_CHAN_244,
-  {RF_CHAN_BOND_246, RF_CHAN_BOND_250},    //RF_CHAN_248,
-  {RF_CHAN_BOND_250, INVALID_RF_CHANNEL},  //RF_CHAN_252,
-  {INVALID_RF_CHANNEL, RF_CHAN_BOND_210},  //RF_CHAN_208,
-  {RF_CHAN_BOND_210, RF_CHAN_BOND_214},    //RF_CHAN_212,
-  {RF_CHAN_BOND_214, INVALID_RF_CHANNEL},  //RF_CHAN_216,
   {INVALID_RF_CHANNEL, RF_CHAN_BOND_38},   //RF_CHAN_36,
   {RF_CHAN_BOND_38, RF_CHAN_BOND_42},      //RF_CHAN_40,
   {RF_CHAN_BOND_42, RF_CHAN_BOND_46},      //RF_CHAN_44,
@@ -421,13 +414,6 @@ const tRfChannelProps rfChannels[NUM_RF_CHANNELS] =
     { 2467, 12 , RF_SUBBAND_2_4_GHZ},        //RF_CHAN_12,
     { 2472, 13 , RF_SUBBAND_2_4_GHZ},        //RF_CHAN_13,
     { 2484, 14 , RF_SUBBAND_2_4_GHZ},        //RF_CHAN_14,
-    { 4920, 240, RF_SUBBAND_4_9_GHZ},        //RF_CHAN_240,
-    { 4940, 244, RF_SUBBAND_4_9_GHZ},        //RF_CHAN_244,
-    { 4960, 248, RF_SUBBAND_4_9_GHZ},        //RF_CHAN_248,
-    { 4980, 252, RF_SUBBAND_4_9_GHZ},        //RF_CHAN_252,
-    { 5040, 208, RF_SUBBAND_4_9_GHZ},        //RF_CHAN_208,
-    { 5060, 212, RF_SUBBAND_4_9_GHZ},        //RF_CHAN_212,
-    { 5080, 216, RF_SUBBAND_4_9_GHZ},        //RF_CHAN_216,
     { 5180, 36 , RF_SUBBAND_5_LOW_GHZ},      //RF_CHAN_36,
     { 5200, 40 , RF_SUBBAND_5_LOW_GHZ},      //RF_CHAN_40,
     { 5220, 44 , RF_SUBBAND_5_LOW_GHZ},      //RF_CHAN_44,
@@ -482,11 +468,6 @@ const tRfChannelProps rfChannels[NUM_RF_CHANNELS] =
     { 2452, 9  , NUM_RF_SUBBANDS},           //RF_CHAN_BOND_9,
     { 2457, 10 , NUM_RF_SUBBANDS},           //RF_CHAN_BOND_10,
     { 2462, 11 , NUM_RF_SUBBANDS},           //RF_CHAN_BOND_11,
-    { 4930, 242, NUM_RF_SUBBANDS},           //RF_CHAN_BOND_242,
-    { 4950, 246, NUM_RF_SUBBANDS},           //RF_CHAN_BOND_246,
-    { 4970, 250, NUM_RF_SUBBANDS},           //RF_CHAN_BOND_250,
-    { 5050, 210, NUM_RF_SUBBANDS},           //RF_CHAN_BOND_210,
-    { 5070, 214, NUM_RF_SUBBANDS},           //RF_CHAN_BOND_214,
     { 5190, 38 , NUM_RF_SUBBANDS},           //RF_CHAN_BOND_38,
     { 5210, 42 , NUM_RF_SUBBANDS},           //RF_CHAN_BOND_42,
     { 5230, 46 , NUM_RF_SUBBANDS},           //RF_CHAN_BOND_46,
diff --git a/wcnss/inc/wlan_nv.h b/wcnss/inc/wlan_nv.h
index 7c8e172c0ea8..01d0460920f0 100644
--- a/wcnss/inc/wlan_nv.h
+++ b/wcnss/inc/wlan_nv.h
@@ -244,15 +244,6 @@ typedef enum
     RF_CHAN_13,
     RF_CHAN_14,
 
-    //4.9GHz Band
-    RF_CHAN_240,
-    RF_CHAN_244,
-    RF_CHAN_248,
-    RF_CHAN_252,
-    RF_CHAN_208,
-    RF_CHAN_212,
-    RF_CHAN_216,
-
     //5GHz Low & Mid U-NII Band
     RF_CHAN_36,
     RF_CHAN_40,
@@ -313,11 +304,6 @@ typedef enum
     RF_CHAN_BOND_9,
     RF_CHAN_BOND_10,
     RF_CHAN_BOND_11,
-    RF_CHAN_BOND_242,    //4.9GHz Band
-    RF_CHAN_BOND_246,
-    RF_CHAN_BOND_250,
-    RF_CHAN_BOND_210,
-    RF_CHAN_BOND_214,
     RF_CHAN_BOND_38,    //5GHz Low & Mid U-NII Band
     RF_CHAN_BOND_42,
     RF_CHAN_BOND_46,
@@ -348,7 +334,7 @@ typedef enum
     MIN_2_4GHZ_CHANNEL = RF_CHAN_1,
     MAX_2_4GHZ_CHANNEL = RF_CHAN_14,
 
-    MIN_5GHZ_CHANNEL = RF_CHAN_240,
+    MIN_5GHZ_CHANNEL = RF_CHAN_36,
     MAX_5GHZ_CHANNEL = RF_CHAN_184,
     NUM_5GHZ_CHANNELS = (MAX_5GHZ_CHANNEL - MIN_5GHZ_CHANNEL + 1),
 
@@ -363,7 +349,7 @@ typedef enum
     MIN_CB_2_4GHZ_CHANNEL = RF_CHAN_BOND_3,
     MAX_CB_2_4GHZ_CHANNEL = RF_CHAN_BOND_11,
 
-    MIN_CB_5GHZ_CHANNEL = RF_CHAN_BOND_242,
+    MIN_CB_5GHZ_CHANNEL = RF_CHAN_BOND_38,
     MAX_CB_5GHZ_CHANNEL = RF_CHAN_BOND_163,
 
     NUM_TPC_2_4GHZ_CHANNELS = 14,