diff options
| author | Yu Wang <yyuwang@codeaurora.org> | 2017-02-23 10:03:19 +0800 |
|---|---|---|
| committer | qcabuildsw <qcabuildsw@localhost> | 2017-02-28 23:41:01 -0800 |
| commit | 49af47f78c2ccfd8848677b7f6505fee04e6b2e0 (patch) | |
| tree | 92a5279244dba27a9a874d81a3ffa838e01a15d3 | |
| parent | 6aa9836f2f7edf650df9023b8d923d5930b06b19 (diff) | |
qcacld-3.0: fix compile error caused by QCA_CONFIG_SMP
Some functions/structs are defined only when
QCA_CONFIG_SMP is enabled, however, they
are also used when QCA_CONFIG_SMP is disabled,
which will cause compilation errors.
Move the definition of these functions/structs
out of macro QCA_CONFIG_SMP.
Return type of cds_alloc_ol_rx_pkt() is not
void, but there is no return statement for
it when QCA_CONFIG_SMP is disabled.
Add 'return NULL' for cds_alloc_ol_rx_pkt().
Change-Id: If6f4298c27f0089219bbceb4a9d0ba1a295f8dcd
CRs-Fixed: 2010568
| -rw-r--r-- | core/cds/inc/cds_sched.h | 5 | ||||
| -rw-r--r-- | core/cds/src/cds_sched.c | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/core/cds/inc/cds_sched.h b/core/cds/inc/cds_sched.h index 3b34c426a4e4..49b9f9416830 100644 --- a/core/cds/inc/cds_sched.h +++ b/core/cds/inc/cds_sched.h @@ -84,9 +84,9 @@ ** OL Rx thread. */ #define CDS_MAX_OL_RX_PKT 4000 +#endif typedef void (*cds_ol_rx_thread_cb)(void *context, void *rxpkt, uint16_t staid); -#endif /* ** QDF Message queue definition. @@ -100,7 +100,6 @@ typedef struct _cds_mq_type { } cds_mq_type, *p_cds_mq_type; -#ifdef QCA_CONFIG_SMP /* ** CDS message wrapper for data rx from TXRX */ @@ -118,7 +117,6 @@ struct cds_ol_rx_pkt { cds_ol_rx_thread_cb callback; }; -#endif /* ** CDS Scheduler context @@ -436,6 +434,7 @@ void cds_indicate_rxpkt(p_cds_sched_context pSchedContext, static inline struct cds_ol_rx_pkt *cds_alloc_ol_rx_pkt(p_cds_sched_context pSchedContext) { + return NULL; } /** diff --git a/core/cds/src/cds_sched.c b/core/cds/src/cds_sched.c index 4208325d8d90..3a5fa03c32e1 100644 --- a/core/cds/src/cds_sched.c +++ b/core/cds/src/cds_sched.c @@ -94,9 +94,7 @@ static int cds_mc_thread(void *Arg); static int cds_ol_rx_thread(void *arg); static unsigned long affine_cpu; static QDF_STATUS cds_alloc_ol_rx_pkt_freeq(p_cds_sched_context pSchedContext); -#endif -#ifdef QCA_CONFIG_SMP #define CDS_CORE_PER_CLUSTER (4) /*Maximum 2 clusters supported*/ #define CDS_MAX_CPU_CLUSTERS 2 |