samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Çatalla 0
Kod Konular Değişiklik İstekleri İşlemler Paketler Projeler Sürüm Wiki Aktivite

qcacld-3.0: Replace channel with frequency for 6G

Kaynağa Gözat 
Replace wlan_reg_is_24ghz_ch with wlan_reg_is_24ghz_ch_freq.
Replace channel with frequency in cds_get_vendor_reg_flags.

Change-Id: I72ffc5550e45be1edf460f9619fead8889cf2967
CRs-Fixed: 2714723
Bu işleme şunda yer alıyor:
Jianmin Zhu
2020-06-17 20:21:09 +08:00
işlemeyi yapan: nshrivas
ebeveyn 1130e58a67
işleme faf92193d4
3 değiştirilmiş dosya ile 38 ekleme ve 30 silme
Yama Dosyasını İndir Diff Dosyasını İndir Tüm dosyaları genişlet Tüm dosyaları daralt

7
core/cds/inc/cds_reg_service.h
Dosyayı Görüntüle

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2014-2017, 2019 The Linux Foundation. All rights reserved.
* Copyright (c) 2014-2017, 2019-2020 The Linux Foundation. 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
@@ -42,14 +42,15 @@
* cds_get_vendor_reg_flags() - This API returns vendor specific regulatory
* channel flags
* @pdev: pdev pointer
* @chan: channel number
* @freq: channel frequency
* @bandwidth: channel BW
* @is_ht_enabled: HT enabled/disabled flag
* @is_vht_enabled: VHT enabled/disabled flag
* @sub_20_channel_width: Sub 20 channel bandwidth
* Return: channel flags
*/
uint32_t cds_get_vendor_reg_flags(struct wlan_objmgr_pdev *pdev, uint32_t chan,
uint32_t cds_get_vendor_reg_flags(struct wlan_objmgr_pdev *pdev,
qdf_freq_t freq,
uint16_t bandwidth,
bool is_ht_enabled, bool is_vht_enabled,
uint8_t sub_20_channel_width);

59
core/cds/src/cds_reg_service.c
Dosyayı Görüntüle

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2014-2019 The Linux Foundation. All rights reserved.
* Copyright (c) 2014-2020 The Linux Foundation. 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
@@ -30,18 +30,19 @@
#include "cds_ieee80211_common_i.h"
#include "cds_config.h"
#include "cds_utils.h"
#include "wlan_reg_services_api.h"
uint32_t cds_get_vendor_reg_flags(struct wlan_objmgr_pdev *pdev,
uint32_t chan, uint16_t bandwidth,
qdf_freq_t freq, uint16_t bandwidth,
bool is_ht_enabled, bool is_vht_enabled,
uint8_t sub_20_channel_width)
{
uint32_t flags = 0;
enum channel_state state;
struct ch_params ch_params;
int sec_channel;
qdf_freq_t sec_freq;
state = wlan_reg_get_channel_state(pdev, chan);
state = wlan_reg_get_channel_state_for_freq(pdev, freq);
if (state == CHANNEL_STATE_INVALID)
return flags;
if (state == CHANNEL_STATE_DFS) {
@@ -50,7 +51,7 @@ uint32_t cds_get_vendor_reg_flags(struct wlan_objmgr_pdev *pdev,
if (state == CHANNEL_STATE_DISABLE)
flags |= IEEE80211_CHAN_BLOCKED;
if (WLAN_REG_IS_24GHZ_CH(chan)) {
if (wlan_reg_is_24ghz_ch_freq(freq)) {
if ((bandwidth == CH_WIDTH_80P80MHZ) ||
(bandwidth == CH_WIDTH_160MHZ) ||
(bandwidth == CH_WIDTH_80MHZ)) {
@@ -62,24 +63,27 @@ uint32_t cds_get_vendor_reg_flags(struct wlan_objmgr_pdev *pdev,
switch (bandwidth) {
case CH_WIDTH_80P80MHZ:
if (wlan_reg_get_5g_bonded_channel_state(pdev, chan,
bandwidth) != CHANNEL_STATE_INVALID) {
if (wlan_reg_get_5g_bonded_channel_state_for_freq(pdev, freq,
bandwidth) !=
CHANNEL_STATE_INVALID) {
if (is_vht_enabled)
flags |= IEEE80211_CHAN_VHT80_80;
}
bandwidth = CH_WIDTH_160MHZ;
/* FALLTHROUGH */
case CH_WIDTH_160MHZ:
if (wlan_reg_get_5g_bonded_channel_state(pdev, chan,
bandwidth) != CHANNEL_STATE_INVALID) {
if (wlan_reg_get_5g_bonded_channel_state_for_freq(pdev, freq,
bandwidth) !=
CHANNEL_STATE_INVALID) {
if (is_vht_enabled)
flags |= IEEE80211_CHAN_VHT160;
}
bandwidth = CH_WIDTH_80MHZ;
/* FALLTHROUGH */
case CH_WIDTH_80MHZ:
if (wlan_reg_get_5g_bonded_channel_state(pdev, chan,
bandwidth) != CHANNEL_STATE_INVALID) {
if (wlan_reg_get_5g_bonded_channel_state_for_freq(pdev, freq,
bandwidth) !=
CHANNEL_STATE_INVALID) {
if (is_vht_enabled)
flags |= IEEE80211_CHAN_VHT80;
}
@@ -88,18 +92,19 @@ uint32_t cds_get_vendor_reg_flags(struct wlan_objmgr_pdev *pdev,
case CH_WIDTH_40MHZ:
qdf_mem_zero(&ch_params, sizeof(ch_params));
ch_params.ch_width = bandwidth;
wlan_reg_set_channel_params(pdev, chan, 0, &ch_params);
wlan_reg_set_channel_params_for_freq(pdev, freq, 0, &ch_params);
if (ch_params.sec_ch_offset == LOW_PRIMARY_CH)
sec_channel = chan + 4;
sec_freq = freq + 20;
else if (ch_params.sec_ch_offset == HIGH_PRIMARY_CH)
sec_channel = chan - 4;
sec_freq = freq - 20;
else
sec_channel = 0;
sec_freq = 0;
if (wlan_reg_get_bonded_channel_state(pdev, chan, bandwidth,
sec_channel) !=
CHANNEL_STATE_INVALID) {
if (wlan_reg_get_bonded_channel_state_for_freq(pdev, freq,
bandwidth,
sec_freq) !=
CHANNEL_STATE_INVALID) {
if (ch_params.sec_ch_offset == LOW_PRIMARY_CH) {
flags |= IEEE80211_CHAN_HT40PLUS;
if (is_vht_enabled)
@@ -121,18 +126,20 @@ uint32_t cds_get_vendor_reg_flags(struct wlan_objmgr_pdev *pdev,
bandwidth = CH_WIDTH_10MHZ;
/* FALLTHROUGH */
case CH_WIDTH_10MHZ:
if ((wlan_reg_get_bonded_channel_state(pdev, chan, bandwidth,
0) != CHANNEL_STATE_INVALID) &&
(sub_20_channel_width ==
WLAN_SUB_20_CH_WIDTH_10))
if (wlan_reg_get_bonded_channel_state_for_freq(pdev, freq,
bandwidth,
0) !=
CHANNEL_STATE_INVALID &&
sub_20_channel_width == WLAN_SUB_20_CH_WIDTH_10)
flags |= IEEE80211_CHAN_HALF;
bandwidth = CH_WIDTH_5MHZ;
/* FALLTHROUGH */
case CH_WIDTH_5MHZ:
if ((wlan_reg_get_bonded_channel_state(pdev, chan, bandwidth,
0) != CHANNEL_STATE_INVALID) &&
(sub_20_channel_width ==
WLAN_SUB_20_CH_WIDTH_5))
if (wlan_reg_get_bonded_channel_state_for_freq(pdev, freq,
bandwidth,
0) !=
CHANNEL_STATE_INVALID &&
sub_20_channel_width == WLAN_SUB_20_CH_WIDTH_5)
flags |= IEEE80211_CHAN_QUARTER;
break;
default:

2
core/hdd/src/wlan_hdd_cfg80211.c
Dosyayı Görüntüle

@@ -2170,7 +2170,7 @@ hdd_update_reg_chan_info(struct hdd_adapter *adapter,
icv->flags = 0;
icv->flags = cds_get_vendor_reg_flags(hdd_ctx->pdev,
icv->ieee_chan_number,
icv->freq,
sap_config->acs_cfg.ch_width,
sap_config->acs_cfg.is_ht_enabled,
sap_config->acs_cfg.is_vht_enabled,