From 79c2bf597e01bd0667508f317d34c4452911f4e7 Mon Sep 17 00:00:00 2001 From: Sathish Kumar Date: Wed, 21 Sep 2016 10:22:21 +0530 Subject: [PATCH] qcacmn: Fix compilation errors in QDF for Big Endian platform Fix compilation issues faced on the WIN big endian platform due to QDF convergence related changes. Change-Id: I33b2a4bbe063acb4585b86e12fa79f96dc12ac73 CRs-Fixed: 1039318 --- qdf/linux/src/i_qdf_time.h | 1 + qdf/linux/src/i_qdf_util.h | 2 +- qdf/linux/src/qdf_event.c | 1 + qdf/linux/src/qdf_list.c | 1 + qdf/linux/src/qdf_lock.c | 42 ++++++++++++++++++++++++++++++++++++ qdf/linux/src/qdf_mc_timer.c | 1 + qdf/linux/src/qdf_nbuf.c | 20 ++++++++++++++++- qdf/linux/src/qdf_threads.c | 1 + 8 files changed, 67 insertions(+), 2 deletions(-) diff --git a/qdf/linux/src/i_qdf_time.h b/qdf/linux/src/i_qdf_time.h index 7862e250a3..fddf36a3cb 100644 --- a/qdf/linux/src/i_qdf_time.h +++ b/qdf/linux/src/i_qdf_time.h @@ -192,6 +192,7 @@ static inline uint64_t __qdf_get_monotonic_boottime(void) } #ifdef QCA_WIFI_3_0_ADRASTEA +#include /** * __qdf_get_log_timestamp() - get QTIMER ticks diff --git a/qdf/linux/src/i_qdf_util.h b/qdf/linux/src/i_qdf_util.h index 228f91f4ff..c66193e392 100644 --- a/qdf/linux/src/i_qdf_util.h +++ b/qdf/linux/src/i_qdf_util.h @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include diff --git a/qdf/linux/src/qdf_event.c b/qdf/linux/src/qdf_event.c index 077f142701..9ad2080746 100644 --- a/qdf/linux/src/qdf_event.c +++ b/qdf/linux/src/qdf_event.c @@ -36,6 +36,7 @@ /* Include Files */ #include "qdf_event.h" +#include /* Function Definitions and Documentation */ diff --git a/qdf/linux/src/qdf_list.c b/qdf/linux/src/qdf_list.c index ee1f462a4c..4d373beb10 100644 --- a/qdf/linux/src/qdf_list.c +++ b/qdf/linux/src/qdf_list.c @@ -35,6 +35,7 @@ /* Include files */ #include +#include /* Function declarations and documenation */ diff --git a/qdf/linux/src/qdf_lock.c b/qdf/linux/src/qdf_lock.c index 68ddea2b98..16a846cd3e 100644 --- a/qdf/linux/src/qdf_lock.c +++ b/qdf/linux/src/qdf_lock.c @@ -244,12 +244,19 @@ EXPORT_SYMBOL(qdf_mutex_release); * * Return: Pointer to the name if it is valid or a default string */ +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0)) const char *qdf_wake_lock_name(qdf_wake_lock_t *lock) { if (lock->name) return lock->name; return "UNNAMED_WAKELOCK"; } +#else +const char *qdf_wake_lock_name(qdf_wake_lock_t *lock) +{ + return "NO_WAKELOCK_SUPPORT"; +} +#endif EXPORT_SYMBOL(qdf_wake_lock_name); /** @@ -261,11 +268,18 @@ EXPORT_SYMBOL(qdf_wake_lock_name); * QDF status success: if wake lock is initialized * QDF status failure: if wake lock was not initialized */ +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0)) QDF_STATUS qdf_wake_lock_create(qdf_wake_lock_t *lock, const char *name) { wakeup_source_init(lock, name); return QDF_STATUS_SUCCESS; } +#else +QDF_STATUS qdf_wake_lock_create(qdf_wake_lock_t *lock, const char *name) +{ + return QDF_STATUS_SUCCESS; +} +#endif EXPORT_SYMBOL(qdf_wake_lock_create); /** @@ -277,6 +291,7 @@ EXPORT_SYMBOL(qdf_wake_lock_create); * QDF status success: if wake lock is acquired * QDF status failure: if wake lock was not acquired */ +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0)) QDF_STATUS qdf_wake_lock_acquire(qdf_wake_lock_t *lock, uint32_t reason) { #ifdef CONFIG_MCL @@ -287,6 +302,12 @@ QDF_STATUS qdf_wake_lock_acquire(qdf_wake_lock_t *lock, uint32_t reason) __pm_stay_awake(lock); return QDF_STATUS_SUCCESS; } +#else +QDF_STATUS qdf_wake_lock_acquire(qdf_wake_lock_t *lock, uint32_t reason) +{ + return QDF_STATUS_SUCCESS; +} +#endif EXPORT_SYMBOL(qdf_wake_lock_acquire); /** @@ -298,6 +319,7 @@ EXPORT_SYMBOL(qdf_wake_lock_acquire); * QDF status success: if wake lock is acquired * QDF status failure: if wake lock was not acquired */ +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0)) QDF_STATUS qdf_wake_lock_timeout_acquire(qdf_wake_lock_t *lock, uint32_t msec) { /* Wakelock for Rx is frequent. @@ -306,6 +328,12 @@ QDF_STATUS qdf_wake_lock_timeout_acquire(qdf_wake_lock_t *lock, uint32_t msec) __pm_wakeup_event(lock, msec); return QDF_STATUS_SUCCESS; } +#else +QDF_STATUS qdf_wake_lock_timeout_acquire(qdf_wake_lock_t *lock, uint32_t msec) +{ + return QDF_STATUS_SUCCESS; +} +#endif EXPORT_SYMBOL(qdf_wake_lock_timeout_acquire); /** @@ -317,6 +345,7 @@ EXPORT_SYMBOL(qdf_wake_lock_timeout_acquire); * QDF status success: if wake lock is acquired * QDF status failure: if wake lock was not acquired */ +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0)) QDF_STATUS qdf_wake_lock_release(qdf_wake_lock_t *lock, uint32_t reason) { #ifdef CONFIG_MCL @@ -327,6 +356,12 @@ QDF_STATUS qdf_wake_lock_release(qdf_wake_lock_t *lock, uint32_t reason) __pm_relax(lock); return QDF_STATUS_SUCCESS; } +#else +QDF_STATUS qdf_wake_lock_release(qdf_wake_lock_t *lock, uint32_t reason) +{ + return QDF_STATUS_SUCCESS; +} +#endif EXPORT_SYMBOL(qdf_wake_lock_release); /** @@ -337,11 +372,18 @@ EXPORT_SYMBOL(qdf_wake_lock_release); * QDF status success: if wake lock is acquired * QDF status failure: if wake lock was not acquired */ +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0)) QDF_STATUS qdf_wake_lock_destroy(qdf_wake_lock_t *lock) { wakeup_source_trash(lock); return QDF_STATUS_SUCCESS; } +#else +QDF_STATUS qdf_wake_lock_destroy(qdf_wake_lock_t *lock) +{ + return QDF_STATUS_SUCCESS; +} +#endif EXPORT_SYMBOL(qdf_wake_lock_destroy); #ifdef CONFIG_MCL diff --git a/qdf/linux/src/qdf_mc_timer.c b/qdf/linux/src/qdf_mc_timer.c index 80143ea588..75527e741f 100644 --- a/qdf/linux/src/qdf_mc_timer.c +++ b/qdf/linux/src/qdf_mc_timer.c @@ -36,6 +36,7 @@ #include "qdf_lock.h" #include "qdf_list.h" #include "qdf_mem.h" +#include #ifdef CONFIG_MCL #include #endif diff --git a/qdf/linux/src/qdf_nbuf.c b/qdf/linux/src/qdf_nbuf.c index 296154d0e2..e61eb55687 100644 --- a/qdf/linux/src/qdf_nbuf.c +++ b/qdf/linux/src/qdf_nbuf.c @@ -2300,6 +2300,7 @@ __qdf_nbuf_sync_for_cpu(qdf_device_t osdev, EXPORT_SYMBOL(__qdf_nbuf_sync_for_cpu); #endif +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0)) /** * qdf_nbuf_update_radiotap_vht_flags() - Update radiotap header VHT flags * @rx_status: Pointer to rx_status. @@ -2373,7 +2374,7 @@ static unsigned int qdf_nbuf_update_radiotap_vht_flags( * Return: length of rtap_len updated. */ unsigned int qdf_nbuf_update_radiotap(struct mon_rx_status *rx_status, - qdf_nbuf_t nbuf, u_int32_t headroom_sz) + qdf_nbuf_t nbuf, uint32_t headroom_sz) { uint8_t rtap_buf[RADIOTAP_HEADER_LEN] = {0}; struct ieee80211_radiotap_header *rthdr = @@ -2436,3 +2437,20 @@ unsigned int qdf_nbuf_update_radiotap(struct mon_rx_status *rx_status, qdf_mem_copy(qdf_nbuf_data(nbuf), rtap_buf, rtap_len); return rtap_len; } +#else +static unsigned int qdf_nbuf_update_radiotap_vht_flags( + struct mon_rx_status *rx_status, + int8_t *rtap_buf, + uint32_t rtap_len) +{ + qdf_print("ERROR: struct ieee80211_radiotap_header not supported"); + return 0; +} + +unsigned int qdf_nbuf_update_radiotap(struct mon_rx_status *rx_status, + qdf_nbuf_t nbuf, uint32_t headroom_sz) +{ + qdf_print("ERROR: struct ieee80211_radiotap_header not supported"); + return 0; +} +#endif diff --git a/qdf/linux/src/qdf_threads.c b/qdf/linux/src/qdf_threads.c index 758b5db99e..679af0cab0 100644 --- a/qdf/linux/src/qdf_threads.c +++ b/qdf/linux/src/qdf_threads.c @@ -38,6 +38,7 @@ #include #include #include +#include /* Function declarations and documenation */