samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Vork 0
Code Kwesties Pull-aanvragen Actions Packages Projecten Publicaties Wiki Activiteit

qcacld-3.0: Rename last_scan_reject_session_id

Bladeren bron 
The HDD context field last_scan_reject_session_id uses the legacy term
"session_id." To align with the current nomenclature change this to
"vdev_id."

Change-Id: Icb429e9a4e557c0edac8a1ba30339cd596209e68
CRs-Fixed: 2410832
This commit is contained in:
Jeff Johnson
2019-03-06 08:45:10 -08:00
gecommit door nshrivas
bovenliggende a2ac4e7375
commit 995fd5192d
3 gewijzigde bestanden met toevoegingen van 9 en 9 verwijderingen
Download Patch-bestand Download Diff-bestand Expand all files Collapse all files

2
core/hdd/inc/wlan_hdd_main.h
Bestand weergeven

@@ -1778,7 +1778,7 @@ struct hdd_context {
bool tdls_umac_comp_active;
bool tdls_nap_active;
uint8_t beacon_probe_rsp_cnt_per_scan;
uint8_t last_scan_reject_session_id;
uint8_t last_scan_reject_vdev_id;
enum scan_reject_states last_scan_reject_reason;
unsigned long last_scan_reject_timestamp;
uint8_t scan_reject_cnt;

2
core/hdd/src/wlan_hdd_main.c
Bestand weergeven

@@ -9557,7 +9557,7 @@ struct hdd_context *hdd_context_create(struct device *dev)
mutex_init(&hdd_ctx->iface_change_lock);
hdd_ctx->parent_dev = dev;
hdd_ctx->last_scan_reject_session_id = 0xFF;
hdd_ctx->last_scan_reject_vdev_id = WLAN_UMAC_VDEV_ID_MAX;
hdd_ctx->config = qdf_mem_malloc(sizeof(struct hdd_config));
if (!hdd_ctx->config) {

14
core/hdd/src/wlan_hdd_scan.c
Bestand weergeven

@@ -316,7 +316,7 @@ void hdd_init_scan_reject_params(struct hdd_context *hdd_ctx)
{
if (hdd_ctx) {
hdd_ctx->last_scan_reject_timestamp = 0;
hdd_ctx->last_scan_reject_session_id = 0xFF;
hdd_ctx->last_scan_reject_vdev_id = WLAN_UMAC_VDEV_ID_MAX;
hdd_ctx->last_scan_reject_reason = 0;
hdd_ctx->scan_reject_cnt = 0;
}
@@ -461,7 +461,7 @@ static int __wlan_hdd_cfg80211_scan(struct wiphy *wiphy,
struct hdd_scan_info *scan_info = NULL;
struct hdd_adapter *con_sap_adapter;
uint16_t con_dfs_ch;
uint8_t curr_session_id;
uint8_t curr_vdev_id;
enum scan_reject_states curr_reason;
static uint32_t scan_ebusy_cnt;
struct scan_params params = {0};
@@ -568,14 +568,14 @@ static int __wlan_hdd_cfg80211_scan(struct wiphy *wiphy,
}
/* Check if scan is allowed at this point of time */
if (hdd_is_connection_in_progress(&curr_session_id, &curr_reason)) {
if (hdd_is_connection_in_progress(&curr_vdev_id, &curr_reason)) {
scan_ebusy_cnt++;
hdd_err_rl("Scan not allowed. scan_ebusy_cnt: %d Session %d Reason %d",
scan_ebusy_cnt, curr_session_id, curr_reason);
if (hdd_ctx->last_scan_reject_session_id != curr_session_id ||
scan_ebusy_cnt, curr_vdev_id, curr_reason);
if (hdd_ctx->last_scan_reject_vdev_id != curr_vdev_id ||
hdd_ctx->last_scan_reject_reason != curr_reason ||
!hdd_ctx->last_scan_reject_timestamp) {
hdd_ctx->last_scan_reject_session_id = curr_session_id;
hdd_ctx->last_scan_reject_vdev_id = curr_vdev_id;
hdd_ctx->last_scan_reject_reason = curr_reason;
hdd_ctx->last_scan_reject_timestamp = jiffies +
msecs_to_jiffies(SCAN_REJECT_THRESHOLD_TIME);
@@ -587,7 +587,7 @@ static int __wlan_hdd_cfg80211_scan(struct wiphy *wiphy,
qdf_system_time_after(jiffies,
hdd_ctx->last_scan_reject_timestamp)) {
hdd_err("scan reject threshold reached Session %d Reason %d count %d reject timestamp %lu jiffies %lu",
curr_session_id, curr_reason,
curr_vdev_id, curr_reason,
hdd_ctx->scan_reject_cnt,
hdd_ctx->last_scan_reject_timestamp,
jiffies);