qcacld-3.0: Remove the 4.9 GHZ channels

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: 856727

core/cds/inc/cds_reg_service.h

@@ -95,14 +95,6 @@ typedef enum {
 	RF_CHAN_13,
 	RF_CHAN_14,
 
-	RF_CHAN_240,
-	RF_CHAN_244,
-	RF_CHAN_248,
-	RF_CHAN_252,
-	RF_CHAN_208,
-	RF_CHAN_212,
-	RF_CHAN_216,
-
 	RF_CHAN_36,
 	RF_CHAN_40,
 	RF_CHAN_44,
@@ -157,11 +149,6 @@ typedef enum {
 	RF_CHAN_BOND_9,
 	RF_CHAN_BOND_10,
 	RF_CHAN_BOND_11,
-	RF_CHAN_BOND_242,
-	RF_CHAN_BOND_246,
-	RF_CHAN_BOND_250,
-	RF_CHAN_BOND_210,
-	RF_CHAN_BOND_214,
 	RF_CHAN_BOND_38,
 	RF_CHAN_BOND_42,
 	RF_CHAN_BOND_46,

core/cds/src/cds_reg_service.c

@@ -138,13 +138,6 @@ const struct chan_map chan_mapping[NUM_RF_CHANNELS] = {
 	{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},
@@ -194,11 +187,6 @@ const struct chan_map chan_mapping[NUM_RF_CHANNELS] = {
 	{2452, 9},
 	{2457, 10},
 	{2462, 11},
-	{4930, 242},
-	{4950, 246},
-	{4970, 250},
-	{5050, 210},
-	{5070, 214},
 	{5190, 38},
 	{5210, 42},
 	{5230, 46},
@@ -597,10 +585,6 @@ static int cds_bw20_ch_index_to_bw40_ch_index(int k)
 		m = k - RF_CHAN_1 + RF_CHAN_BOND_3;
 		if (m > RF_CHAN_BOND_11)
 			m = RF_CHAN_BOND_11;
-	} else if (k >= RF_CHAN_240 && k <= RF_CHAN_216) {
-		m = k - RF_CHAN_240 + RF_CHAN_BOND_242;
-		if (m > RF_CHAN_BOND_214)
-			m = RF_CHAN_BOND_214;
 	} else if (k >= RF_CHAN_36 && k <= RF_CHAN_64) {
 		m = k - RF_CHAN_36 + RF_CHAN_BOND_38;
 		if (m > RF_CHAN_BOND_62)

core/hdd/src/wlan_hdd_cfg80211.c

@@ -185,13 +185,6 @@ static struct ieee80211_channel hdd_social_channels_2_4_ghz[] = {
 };
 
 static struct ieee80211_channel hdd_channels_5_ghz[] = {
-	HDD5GHZCHAN(4920, 240, 0),
-	HDD5GHZCHAN(4940, 244, 0),
-	HDD5GHZCHAN(4960, 248, 0),
-	HDD5GHZCHAN(4980, 252, 0),
-	HDD5GHZCHAN(5040, 208, 0),
-	HDD5GHZCHAN(5060, 212, 0),
-	HDD5GHZCHAN(5080, 216, 0),
 	HDD5GHZCHAN(5180, 36, 0),
 	HDD5GHZCHAN(5200, 40, 0),
 	HDD5GHZCHAN(5220, 44, 0),

core/sap/src/sap_ch_select.c

@@ -114,20 +114,6 @@ sapSafeChannelType safe_channels[NUM_20MHZ_RF_CHANNELS] = {
 	,                       /* RF_CHAN_13, */
 	{14, true}
 	,                       /* RF_CHAN_14, */
-	{240, true}
-	,                       /* RF_CHAN_240, */
-	{244, true}
-	,                       /* RF_CHAN_244, */
-	{248, true}
-	,                       /* RF_CHAN_248, */
-	{252, true}
-	,                       /* RF_CHAN_252, */
-	{208, true}
-	,                       /* RF_CHAN_208, */
-	{212, true}
-	,                       /* RF_CHAN_212, */
-	{216, true}
-	,                       /* RF_CHAN_216, */
 	{36, true}
 	,                       /* RF_CHAN_36, */
 	{40, true}