A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-11-08 11:45:53 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge "qcacmn: Fix the invalid memory access issue in TDLS"

Browse source
This commit is contained in:
Linux Build Service Account 2017-11-09 20:25:56 -08:00 • committed by Gerrit - the friendly Code Review server
commit 2fb5613f1b
5 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
dp/inc/cdp_txrx_stats_struct.h
View file

@ -502,6 +502,7 @@ enum _ol_ath_param_t {
OL_ATH_PARAM_NOMINAL_NOISEFLOOR = 358,
OL_ATH_PARAM_CHAN_INFO = 359,
OL_ATH_PARAM_ACS_RANK = 360,
OL_ATH_PARAM_TXCHAINSOFT = 361,
};
/* Enumeration of PDEV Configuration parameter */

1
dp/wifi3.0/dp_rx.c
View file

@ -1048,7 +1048,6 @@ dp_rx_process(struct dp_intr *int_ctx, void *hal_ring, uint32_t quota)
DP_STATS_INCC(peer, rx.ampdu_cnt, 1, ampdu_flag);
DP_STATS_INCC(peer, rx.non_ampdu_cnt, 1, !(ampdu_flag));
hal_rx_msdu_desc_info_get(ring_desc, &msdu_desc_info);
amsdu_flag = ((msdu_desc_info.msdu_flags &
HAL_MSDU_F_FIRST_MSDU_IN_MPDU) &&
(msdu_desc_info.msdu_flags &

11
umac/tdls/dispatcher/inc/wlan_tdls_public_structs.h
View file

@ -930,9 +930,8 @@ struct tdls_event_notify {
* @dialog: dialog token used in the frame.
* @status_code: status to be incuded in the frame
* @responder: Tdls request type
* @len: lenght of additional Ies
* @peer_capability: peer cpabilities
* @len: lenght of additional Ies
* @len: length of additional Ies
* @buf: additional IEs to be included
*/
struct tdls_send_mgmt {
@ -944,7 +943,7 @@ struct tdls_send_mgmt {
uint32_t peer_capability;
uint8_t len;
/* Variable length, do not add anything after this */
uint8_t *buf;
uint8_t buf[];
};
/**
@ -975,6 +974,9 @@ struct tdls_validate_action_req {
* @chk_frame: frame validation structure
* @session_id: session id
* @vdev_id: vdev id
* @cmd_buf: cmd buffer
* @len: length of the frame
* @use_default_ac: access category
* @tdls_mgmt: tdls managment
*/
struct tdls_action_frame_request {
@ -984,8 +986,9 @@ struct tdls_action_frame_request {
uint8_t vdev_id;
const uint8_t *cmd_buf;
uint8_t len;
struct tdls_send_mgmt tdls_mgmt;
bool use_default_ac;
/* Variable length, do not add anything after this */
struct tdls_send_mgmt tdls_mgmt;
};
/**

1
wmi/inc/wmi_unified_param.h
View file

@ -5550,6 +5550,7 @@ typedef enum {
wmi_pdev_param_btcoex_cfg,
wmi_pdev_param_mesh_mcast_enable,
wmi_pdev_param_tx_ack_timeout,
wmi_pdev_param_soft_tx_chain_mask,
wmi_pdev_param_max,
} wmi_conv_pdev_params_id;

2
wmi/src/wmi_unified_non_tlv.c
View file

@ -8819,6 +8819,8 @@ static void populate_pdev_param_non_tlv(uint32_t *pdev_param)
pdev_param[wmi_pdev_param_atf_peer_stats] =
WMI_PDEV_PARAM_ATF_PEER_STATS;
pdev_param[wmi_pdev_param_tx_ack_timeout] = WMI_UNAVAILABLE_PARAM;
pdev_param[wmi_pdev_param_soft_tx_chain_mask] =
WMI_PDEV_PARAM_SOFT_TX_CHAIN_MASK;
pdev_param[wmi_pdev_param_rfkill_enable] = WMI_UNAVAILABLE_PARAM;
pdev_param[wmi_pdev_param_hw_rfkill_config] = WMI_UNAVAILABLE_PARAM;
pdev_param[wmi_pdev_param_low_power_rf_enable] = WMI_UNAVAILABLE_PARAM;