samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: Use converged qcacmn macros (part 1)

Browse Source 
Replace the existing qcacld-3.0 macros with qcacmn converged
macros.

Change-Id: Ie05f396fcd2e01cf86256f25dbc171bbdf763da9
CRs-Fixed: 2416429
This commit is contained in:
Srinivas Girigowda
2019-03-14 11:37:33 -07:00
committed by nshrivas
parent 9a05f43a18
commit cf161406dd
24 changed files with 108 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
components/p2p/core/src/wlan_p2p_off_chan_tx.c
View File

@@ -206,10 +206,10 @@ static const uint8_t *p2p_get_p2pie_from_probe_rsp(
ie_len = tx_ctx->buf_len - PROBE_RSP_IE_OFFSET;
p2p_ie = p2p_get_p2pie_ptr(ie, ie_len);
while ((p2p_ie) &&
(P2P_MAX_IE_LENGTH == p2p_ie[1])) {
(WLAN_MAX_IE_LEN == p2p_ie[1])) {
ie_len = tx_ctx->buf_len - (p2p_ie - tx_ctx->buf);
if (ie_len > 2) {
ie = p2p_ie + P2P_MAX_IE_LENGTH + 2;
ie = p2p_ie + WLAN_MAX_IE_LEN + 2;
tmp_p2p_ie = p2p_get_p2pie_ptr(ie, ie_len);
}
@@ -467,12 +467,12 @@ static uint16_t p2p_update_noa_stream(struct tx_action_context *tx_ctx,
p2p_ie[1] = orig_len;
}
if ((p2p_ie[1] + noa_len) > P2P_MAX_IE_LENGTH) {
if ((p2p_ie[1] + noa_len) > WLAN_MAX_IE_LEN) {
overflow_len = p2p_ie[1] + noa_len -
P2P_MAX_IE_LENGTH;
WLAN_MAX_IE_LEN;
noa_len = p2p_get_noa_attr_stream_in_mult_p2p_ies(
noa_stream, noa_len, overflow_len);
p2p_ie[1] = P2P_MAX_IE_LENGTH;
p2p_ie[1] = WLAN_MAX_IE_LEN;
} else {
/* increment the length of P2P IE */
p2p_ie[1] += noa_len;

3
components/p2p/core/src/wlan_p2p_off_chan_tx.h
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2017-2018 The Linux Foundation. All rights reserved.
* Copyright (c) 2017-2019 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
@@ -36,7 +36,6 @@
#define P2P_MAX_NOA_ATTR_LEN 31
#define P2P_IE_HEADER_LEN 6
#define P2P_MAX_IE_LENGTH 255
#define P2P_ACTION_OFFSET 24
#define P2P_PUBLIC_ACTION_FRAME_TYPE_OFFSET 30
#define P2P_ACTION_FRAME_TYPE_OFFSET 29