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

qcacmn: Add WIN Driver compilation fix

Browse Source 
Fix compilation errors for WIN driver

Change-Id: I2b7344c9632ea673754aa1f4d7003473b2527ada
CRs-Fixed: 981187
This commit is contained in:
Anurag Chouhan
2016-04-04 17:11:39 +05:30
committed by Vishwajith Upendra
parent caf80788e6
commit 8bfdee0154
4 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
qdf/inc/qdf_types.h
View File

@@ -215,7 +215,6 @@ typedef void (*qdf_timer_func_t)(void *);
#define qdf_offsetof(type, field) offsetof(type, field) #define qdf_offsetof(type, field) offsetof(type, field)
#ifdef CONFIG_MCL
/** /**
* typedef QDF_MODULE_ID - QDF Module IDs * typedef QDF_MODULE_ID - QDF Module IDs
* @QDF_MODULE_ID_TLSHIM: TLSHIM module ID * @QDF_MODULE_ID_TLSHIM: TLSHIM module ID
@@ -273,6 +272,7 @@ typedef enum {
QDF_MODULE_ID_MAX QDF_MODULE_ID_MAX
} QDF_MODULE_ID; } QDF_MODULE_ID;
#ifdef CONFIG_MCL
/** /**
* enum tQDF_ADAPTER_MODE - Concurrency role. * enum tQDF_ADAPTER_MODE - Concurrency role.
* @QDF_STA_MODE: STA mode * @QDF_STA_MODE: STA mode
@@ -324,16 +324,13 @@ enum tQDF_GLOBAL_CON_MODE {
#define qdf_print(args...) \ #define qdf_print(args...) \
QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, ## args) QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, ## args)
#define qdf_vprint __qdf_vprint
#define qdf_snprint __qdf_snprint
#else #else
#define qdf_print printk #define qdf_print printk
#endif /* CONFIG_MCL */ #endif /* CONFIG_MCL */
#define qdf_vprint __qdf_vprint
#define qdf_snprint __qdf_snprint
#ifdef WLAN_OPEN_P2P_INTERFACE #ifdef WLAN_OPEN_P2P_INTERFACE
/* This should match with WLAN_MAX_INTERFACES */ /* This should match with WLAN_MAX_INTERFACES */

2
qdf/linux/src/i_qdf_trace.h
View File

@@ -70,7 +70,7 @@
printk("\n"); \ printk("\n"); \
} \ } \
} while (0) } while (0)
#define QDF_TRACE printk #define QDF_TRACE(x, y, args...) printk(args)
#endif /* CONFIG_MCL */ #endif /* CONFIG_MCL */

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

@@ -310,7 +310,7 @@ QDF_STATUS qdf_mc_timer_init(qdf_mc_timer_t *timer, QDF_TIMER_TYPE timer_type,
/* set the various members of the timer structure /* set the various members of the timer structure
* with arguments passed or with default values * with arguments passed or with default values
*/ */
spin_lock_init(&timer->platform_info.spinlock); qdf_spinlock_create(&timer->platform_info.spinlock);
if (QDF_TIMER_TYPE_SW == timer_type) if (QDF_TIMER_TYPE_SW == timer_type)
init_timer_deferrable(&(timer->platform_info.timer)); init_timer_deferrable(&(timer->platform_info.timer));
else else
@@ -454,7 +454,6 @@ EXPORT_SYMBOL(qdf_mc_timer_destroy);
QDF_STATUS qdf_mc_timer_destroy(qdf_mc_timer_t *timer) QDF_STATUS qdf_mc_timer_destroy(qdf_mc_timer_t *timer)
{ {
QDF_STATUS v_status = QDF_STATUS_SUCCESS; QDF_STATUS v_status = QDF_STATUS_SUCCESS;
unsigned long flags;
/* check for invalid pointer */ /* check for invalid pointer */
if (NULL == timer) { if (NULL == timer) {
@@ -471,7 +470,7 @@ QDF_STATUS qdf_mc_timer_destroy(qdf_mc_timer_t *timer)
QDF_ASSERT(0); QDF_ASSERT(0);
return QDF_STATUS_E_INVAL; return QDF_STATUS_E_INVAL;
} }
spin_lock_irqsave(&timer->platform_info.spinlock, flags); qdf_spin_lock_irqsave(&timer->platform_info.spinlock);
switch (timer->state) { switch (timer->state) {
@@ -501,11 +500,11 @@ QDF_STATUS qdf_mc_timer_destroy(qdf_mc_timer_t *timer)
if (QDF_STATUS_SUCCESS == v_status) { if (QDF_STATUS_SUCCESS == v_status) {
timer->platform_info.cookie = LINUX_INVALID_TIMER_COOKIE; timer->platform_info.cookie = LINUX_INVALID_TIMER_COOKIE;
timer->state = QDF_TIMER_STATE_UNUSED; timer->state = QDF_TIMER_STATE_UNUSED;
spin_unlock_irqrestore(&timer->platform_info.spinlock, flags); qdf_spin_unlock_irqrestore(&timer->platform_info.spinlock);
return v_status; return v_status;
} }
spin_unlock_irqrestore(&timer->platform_info.spinlock, flags); qdf_spin_unlock_irqrestore(&timer->platform_info.spinlock);
QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO_HIGH, QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO_HIGH,
"%s: Cannot destroy timer in state = %d", __func__, "%s: Cannot destroy timer in state = %d", __func__,

1
qdf/linux/src/qdf_mem.c
View File

@@ -35,6 +35,7 @@
#include "qdf_lock.h" #include "qdf_lock.h"
#include "qdf_mc_timer.h" #include "qdf_mc_timer.h"
#include "qdf_module.h" #include "qdf_module.h"
#include <qdf_trace.h>
#if defined(CONFIG_CNSS) #if defined(CONFIG_CNSS)
#include <net/cnss.h> #include <net/cnss.h>