diff options
| author | CNSS_WLAN Service <cnssbldsw@qualcomm.com> | 2018-03-20 05:43:57 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-03-20 05:43:57 -0700 |
| commit | a8b2647cb8da3b051b4b52e95eab424a8e01f73c (patch) | |
| tree | 60b71ee11454d14d0ccd0bdbbae6fe65c7750e79 | |
| parent | f9b827b1ee3d8d1d118f3abea6d4f268eb10f56d (diff) | |
| parent | 90b65ae22352df6f8d08882c2bf04a3de7a50a96 (diff) | |
Merge "qcacld-2.0: Fix the error return dismatch on msm-4.9" into wlan-cld2.driver.lnx.1.0
| -rw-r--r-- | CORE/VOSS/inc/vos_cnss.h | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/CORE/VOSS/inc/vos_cnss.h b/CORE/VOSS/inc/vos_cnss.h index fa2d7f8d508e..8bfae8619cb4 100644 --- a/CORE/VOSS/inc/vos_cnss.h +++ b/CORE/VOSS/inc/vos_cnss.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2017 The Linux Foundation. All rights reserved. + * Copyright (c) 2015-2018 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -579,6 +579,18 @@ static inline int vos_cache_boarddata(unsigned int offset, #endif #if defined(CONFIG_CNSS) && defined(HIF_SDIO) +#include <linux/version.h> +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)) +static inline bool vos_oob_enabled(void) +{ + bool enabled = true; + + if (-EINVAL == cnss_wlan_query_oob_status()) + enabled = false; + + return enabled; +} +#else static inline bool vos_oob_enabled(void) { bool enabled = true; @@ -588,6 +600,7 @@ static inline bool vos_oob_enabled(void) return enabled; } +#endif static inline int vos_register_oob_irq_handler(oob_irq_handler_t handler, void *pm_oob) |