mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-10-01 01:35:54 -04:00
49 lines
1.6 KiB
Diff
49 lines
1.6 KiB
Diff
|
From 188e12a816508b11771f362c852782ec9a6f9394 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jeff Johnson <jjohnson@codeaurora.org>
|
||
|
|
Date: Wed, 19 Oct 2016 07:25:33 -0700
|
||
|
|
Subject: qcacld-2.0: Fix hdd_ocb_config_new() signature
|
||
|
|
|
||
|
|
hdd_ocb_config_new() takes four "length" parameters, currently defined
|
||
|
|
to be of type 'int'. Since these are summed to calculate the size of a
|
||
|
|
dynamic memory allocation they must be non-negative so change them to
|
||
|
|
'uint32_t'.
|
||
|
|
|
||
|
|
Change-Id: Ie66bbb7c69aba92d9d846cb90628110b3bea8f74
|
||
|
|
CRs-Fixed: 1079596
|
||
|
|
---
|
||
|
|
CORE/HDD/src/wlan_hdd_ocb.c | 11 ++++++-----
|
||
|
|
1 file changed, 6 insertions(+), 5 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/CORE/HDD/src/wlan_hdd_ocb.c b/CORE/HDD/src/wlan_hdd_ocb.c
|
||
|
|
index b6494ca..95fde5e 100644
|
||
|
|
--- a/CORE/HDD/src/wlan_hdd_ocb.c
|
||
|
|
+++ b/CORE/HDD/src/wlan_hdd_ocb.c
|
||
|
|
@@ -406,10 +406,11 @@ static int hdd_ocb_register_sta(hdd_adapter_t *adapter)
|
||
|
|
*
|
||
|
|
* Return: A pointer to the OCB configuration struct, NULL on failure.
|
||
|
|
*/
|
||
|
|
-static struct sir_ocb_config *hdd_ocb_config_new(int num_channels,
|
||
|
|
- int num_schedule,
|
||
|
|
- int ndl_chan_list_len,
|
||
|
|
- int ndl_active_state_list_len)
|
||
|
|
+static
|
||
|
|
+struct sir_ocb_config *hdd_ocb_config_new(uint32_t num_channels,
|
||
|
|
+ uint32_t num_schedule,
|
||
|
|
+ uint32_t ndl_chan_list_len,
|
||
|
|
+ uint32_t ndl_active_state_list_len)
|
||
|
|
{
|
||
|
|
struct sir_ocb_config *ret = 0;
|
||
|
|
uint32_t len;
|
||
|
|
@@ -903,7 +904,7 @@ static int __wlan_hdd_cfg80211_ocb_set_config(struct wiphy *wiphy,
|
||
|
|
void *def_tx_param = NULL;
|
||
|
|
uint32_t def_tx_param_size = 0;
|
||
|
|
int i;
|
||
|
|
- int channel_count, schedule_size;
|
||
|
|
+ uint32_t channel_count, schedule_size;
|
||
|
|
struct sir_ocb_config *config;
|
||
|
|
int rc = -EINVAL;
|
||
|
|
uint8_t *mac_addr;
|
||
|
|
--
|
||
|
|
cgit v1.1
|
||
|
|
|