浏览代码

qcacmn: Remove unused SBS specific code

Remove unused SBS specific code.

Change-Id: I2e35eee885b2a70fd78ff48acc9d2a96e9573b77
CRs-Fixed: 3093793
Abhishek Singh 3 年之前
父节点
当前提交
f8e482d488

+ 0 - 17
umac/regulatory/core/src/reg_services_common.c

@@ -4488,23 +4488,6 @@ void reg_update_nol_history_ch_for_freq(struct wlan_objmgr_pdev *pdev,
 	}
 }
 
-static inline bool REG_IS_FREQUENCY_VALID_5G_SBS(qdf_freq_t curfreq,
-						 qdf_freq_t newfreq)
-{
-	return ((curfreq) > (newfreq) ?
-	REG_CH_TO_FREQ(reg_get_chan_enum_for_freq(curfreq))
-	- REG_CH_TO_FREQ(reg_get_chan_enum_for_freq(newfreq))
-	> REG_SBS_SEPARATION_THRESHOLD :
-	REG_CH_TO_FREQ(reg_get_chan_enum_for_freq(newfreq))
-	- REG_CH_TO_FREQ(reg_get_chan_enum_for_freq(curfreq))
-	> REG_SBS_SEPARATION_THRESHOLD);
-}
-
-bool reg_is_frequency_valid_5g_sbs(qdf_freq_t curfreq, qdf_freq_t newfreq)
-{
-	return REG_IS_FREQUENCY_VALID_5G_SBS(curfreq, newfreq);
-}
-
 qdf_freq_t reg_min_chan_freq(void)
 {
 	return channel_map[MIN_24GHZ_CHANNEL].center_freq;

+ 1 - 9
umac/regulatory/core/src/reg_services_common.h

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2017-2021 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved.
  *
  *
  * Permission to use, copy, modify, and/or distribute this software for
@@ -999,15 +1000,6 @@ void reg_update_nol_history_ch_for_freq(struct wlan_objmgr_pdev *pdev,
  */
 bool reg_is_same_band_freqs(qdf_freq_t freq1, qdf_freq_t freq2);
 
-/**
- * reg_is_frequency_valid_5g_sbs() Check if the given frequency is 5G SBS.
- * @curfreq: current channel frequency
- * @newfreq: new channel center frequency
- *
- * Return: true if the given center frequency is a valid 5G SBS
- */
-bool reg_is_frequency_valid_5g_sbs(qdf_freq_t curfreq, qdf_freq_t newfreq);
-
 /**
  * reg_freq_to_band() - Get band from channel frequency
  * @chan_num: channel frequency

+ 1 - 2
umac/regulatory/dispatcher/inc/reg_services_public_struct.h

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2017-2021 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -28,8 +29,6 @@
 #include <wlan_reg_afc.h>
 #endif
 
-#define REG_SBS_SEPARATION_THRESHOLD 100
-
 #ifdef CONFIG_BAND_6GHZ
 #define REG_MAX_CHANNELS_PER_OPERATING_CLASS        70
 /*

+ 0 - 10
umac/regulatory/dispatcher/inc/wlan_reg_services_api.h

@@ -1142,16 +1142,6 @@ void wlan_reg_update_nol_history_ch_for_freq(struct wlan_objmgr_pdev *pdev,
 					     uint16_t *ch_list,
 					     uint8_t num_ch,
 					     bool nol_history_ch);
-/**
- * wlan_reg_is_frequency_valid_5g_sbs() Check if the given frequency is 5G SBS.
- * @curfreq: current channel center frequency
- * @newfreq:new channel center frequency
- *
- * Return: true if the given frequency is a valid 5G SBS
- */
-#define WLAN_REG_IS_FREQUENCY_VALID_5G_SBS(curfreq, newfreq) \
-	wlan_reg_is_frequency_valid_5g_sbs(curfreq, newfreq)
-bool wlan_reg_is_frequency_valid_5g_sbs(qdf_freq_t curfreq, qdf_freq_t newfreq);
 
 /**
  * wlan_reg_chan_has_dfs_attribute_for_freq() - check channel has dfs

+ 0 - 5
umac/regulatory/dispatcher/src/wlan_reg_services_api.c

@@ -949,11 +949,6 @@ bool wlan_reg_is_same_band_freqs(qdf_freq_t freq1, qdf_freq_t freq2)
 	return reg_is_same_band_freqs(freq1, freq2);
 }
 
-bool wlan_reg_is_frequency_valid_5g_sbs(qdf_freq_t curfreq, qdf_freq_t newfreq)
-{
-	return reg_is_frequency_valid_5g_sbs(curfreq, newfreq);
-}
-
 enum channel_enum wlan_reg_get_chan_enum_for_freq(qdf_freq_t freq)
 {
 	return reg_get_chan_enum_for_freq(freq);