summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorService qcabuildsw <qcabuildsw@localhost>2016-09-19 12:40:22 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2016-09-19 12:40:22 -0700
commitc32100e02ebb3b2a5af0ee0246085180bce10a7e (patch)
tree281a817ae0738ce3a7fd9a94383ba799cf7373af
parent8dcb9450f1c028e0baca022585432cb75489a43a (diff)
parent32e4fc75d1f77660c1e3d08bc358c4a8302bbace (diff)
Merge "qcacld-3.0: Cleanup IBSS feature" into wlan-cld3.driver.lnx.1.1-dev
-rw-r--r--core/dp/txrx/ol_txrx.c2
-rw-r--r--core/wma/inc/wma_internal.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/core/dp/txrx/ol_txrx.c b/core/dp/txrx/ol_txrx.c
index e4f6c5554100..c43ea2b82182 100644
--- a/core/dp/txrx/ol_txrx.c
+++ b/core/dp/txrx/ol_txrx.c
@@ -2388,6 +2388,7 @@ ol_txrx_is_rx_fwd_disabled(ol_txrx_vdev_handle vdev)
return cfg->rx_fwd_disabled;
}
+#ifdef QCA_IBSS_SUPPORT
/**
* ol_txrx_update_ibss_add_peer_num_of_vdev() - update and return peer num
* @vdev: vdev handle
@@ -2427,6 +2428,7 @@ uint16_t ol_txrx_set_ibss_vdev_heart_beat_timer(ol_txrx_vdev_handle vdev,
return old_timer_value;
}
+#endif
/**
* ol_txrx_remove_peers_for_vdev() - remove all vdev peers with lock held
diff --git a/core/wma/inc/wma_internal.h b/core/wma/inc/wma_internal.h
index 11b6d1d40cdd..b5fc9f4eae48 100644
--- a/core/wma/inc/wma_internal.h
+++ b/core/wma/inc/wma_internal.h
@@ -493,7 +493,7 @@ bool wma_is_vdev_in_ibss_mode(tp_wma_handle wma, uint8_t vdev_id);
* Return false since no vdev can be in ibss mode without ibss support
*/
static inline
-bool wma_is_vdev_in_ibss_mode(tp_wma_handle wma, uint8_t vdev_id);
+bool wma_is_vdev_in_ibss_mode(tp_wma_handle wma, uint8_t vdev_id)
{
return false;
}