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

Merge "qcacmn: Clean up CONFIG_MCL for MAX_BCN_PROBE_IN_SCAN_QUEUE"

Browse Source
This commit is contained in:
Linux Build Service Account
2019-08-02 07:12:11 -07:00
committed by Gerrit - the friendly Code Review server
parent 1d90f4ee32 689d670cc9
commit 3d0aa07dd9
5 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
qdf/inc/qdf_timer.h
View File

@@ -51,19 +51,13 @@ qdf_timer_init(qdf_handle_t hdl, qdf_timer_t *timer, qdf_timer_func_t func,
return __qdf_timer_init(timer, func, arg, type); return __qdf_timer_init(timer, func, arg, type);
} }
#ifdef QDF_TIMER_MULTIPLIER_FRAC
#define qdf_msecs_to_jiffies(msec) \
(QDF_TIMER_MULTIPLIER_FRAC * __qdf_msecs_to_jiffies(msec))
#else
#define qdf_msecs_to_jiffies(msec) \
(qdf_timer_get_multiplier() * __qdf_msecs_to_jiffies(msec))
#endif
/** /**
* qdf_timer_start() - start a timer * qdf_timer_start() - start a timer
* @timer: timer to start * @timer: timer to start
* @msec: Expiration period in milliseconds * @msec: Expiration period in milliseconds
* *
* If QDF timer multiplier is set, the timeout value may get scaled.
*
* Return: none * Return: none
*/ */
static inline void qdf_timer_start(qdf_timer_t *timer, int msec) static inline void qdf_timer_start(qdf_timer_t *timer, int msec)
@@ -78,6 +72,8 @@ static inline void qdf_timer_start(qdf_timer_t *timer, int msec)
* *
* If @timer is not active, it will be activated. * If @timer is not active, it will be activated.
* *
* If QDF timer multiplier is set, the timeout value may get scaled.
*
* Return: none * Return: none
*/ */
static inline void qdf_timer_mod(qdf_timer_t *timer, int msec) static inline void qdf_timer_mod(qdf_timer_t *timer, int msec)

13
qdf/linux/src/i_qdf_timer.h
View File

@@ -43,7 +43,13 @@ struct __qdf_timer_t {
void *context; void *context;
}; };
#define __qdf_msecs_to_jiffies(msec) msecs_to_jiffies(msec) #ifdef QDF_TIMER_MULTIPLIER_FRAC
#define __qdf_scaled_msecs_to_jiffies(msec) \
(QDF_TIMER_MULTIPLIER_FRAC * msecs_to_jiffies(msec))
#else
#define __qdf_scaled_msecs_to_jiffies(msec) \
(qdf_timer_get_multiplier() * msecs_to_jiffies(msec))
#endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
static inline void __os_timer_shim(struct timer_list *os_timer) static inline void __os_timer_shim(struct timer_list *os_timer)
@@ -121,13 +127,14 @@ static inline void __qdf_timer_start(struct __qdf_timer_t *timer, uint32_t msec)
{ {
struct timer_list *os_timer = &timer->os_timer; struct timer_list *os_timer = &timer->os_timer;
os_timer->expires = jiffies + __qdf_msecs_to_jiffies(msec); os_timer->expires = jiffies + __qdf_scaled_msecs_to_jiffies(msec);
add_timer(os_timer); add_timer(os_timer);
} }
static inline void __qdf_timer_mod(struct __qdf_timer_t *timer, uint32_t msec) static inline void __qdf_timer_mod(struct __qdf_timer_t *timer, uint32_t msec)
{ {
mod_timer(&timer->os_timer, jiffies + __qdf_msecs_to_jiffies(msec)); mod_timer(&timer->os_timer,
jiffies + __qdf_scaled_msecs_to_jiffies(msec));
} }
static inline bool __qdf_timer_stop(struct __qdf_timer_t *timer) static inline bool __qdf_timer_stop(struct __qdf_timer_t *timer)

2
qdf/linux/src/qdf_event.c
View File

@@ -214,7 +214,7 @@ QDF_STATUS qdf_wait_single_event(qdf_event_t *event, uint32_t timeout)
ret = wait_for_completion_timeout( ret = wait_for_completion_timeout(
&event->complete, &event->complete,
qdf_msecs_to_jiffies(timeout)); __qdf_scaled_msecs_to_jiffies(timeout));
if (ret <= 0) if (ret <= 0)
return QDF_STATUS_E_TIMEOUT; return QDF_STATUS_E_TIMEOUT;

2
qdf/linux/src/qdf_mc_timer.c
View File

@@ -677,7 +677,7 @@ QDF_STATUS qdf_mc_timer_start(qdf_mc_timer_t *timer, uint32_t expiration_time)
/* start the timer */ /* start the timer */
mod_timer(&(timer->platform_info.timer), mod_timer(&(timer->platform_info.timer),
jiffies + qdf_msecs_to_jiffies(expiration_time)); jiffies + __qdf_scaled_msecs_to_jiffies(expiration_time));
timer->state = QDF_TIMER_STATE_RUNNING; timer->state = QDF_TIMER_STATE_RUNNING;

6
umac/scan/dispatcher/inc/wlan_scan_public_structs.h
View File

@@ -69,12 +69,6 @@ typedef uint32_t wlan_scan_id;
#define MAX_INDEX_SCORE 100 #define MAX_INDEX_SCORE 100
#define MAX_INDEX_PER_INI 4 #define MAX_INDEX_PER_INI 4
#ifdef CONFIG_MCL
#define MAX_BCN_PROBE_IN_SCAN_QUEUE 150
#else
#define MAX_BCN_PROBE_IN_SCAN_QUEUE 2000
#endif
#define WLAN_GET_BITS(_val, _index, _num_bits) \ #define WLAN_GET_BITS(_val, _index, _num_bits) \
(((_val) >> (_index)) & ((1 << (_num_bits)) - 1)) (((_val) >> (_index)) & ((1 << (_num_bits)) - 1))