qcacmn: Clean up CMN_VDEV_MGR_TGT_IF_ENABLE

WIN and MCL both uses common targer_if code for vdev manager.
So legacy code and "CMN_VDEV_MGR_TGT_IF_ENABLE" macro is removed.

Change-Id: I2984ae44f3a7cfa01b8f1455353d09deb4db5759
CRs-Fixed: 2503804
This commit is contained in:
Abhishek Ambure
2019-08-06 12:26:39 +05:30
committed by nshrivas
szülő 151c4bb3d6
commit c76db37021
13 fájl változott, egészen pontosan 1 új sor hozzáadva és 746 régi sor törölve

Fájl megtekintése

@@ -32,11 +32,9 @@
#include "wlan_objmgr_pdev_obj.h"
#include "wlan_objmgr_psoc_obj.h"
#include "wlan_vdev_mlme_main.h"
#ifdef CMN_VDEV_MGR_TGT_IF_ENABLE
#include "include/wlan_vdev_mlme.h"
#include "wlan_vdev_mlme_api.h"
#include "wlan_mlme_dbg.h"
#endif
/* CONF: privacy enabled */
#define WLAN_VDEV_F_PRIVACY 0x00000001
@@ -315,17 +313,6 @@ struct wlan_objmgr_vdev_mlme {
uint32_t vdev_op_flags;
uint8_t mataddr[QDF_MAC_ADDR_SIZE];
uint8_t macaddr[QDF_MAC_ADDR_SIZE];
#ifndef CMN_VDEV_MGR_TGT_IF_ENABLE
char ssid[WLAN_SSID_MAX_LEN + 1];
uint8_t ssid_len;
uint8_t nss;
uint8_t tx_chainmask;
uint8_t rx_chainmask;
uint8_t tx_power;
uint32_t max_rate;
uint32_t tx_mgmt_rate;
uint32_t per_band_mgmt_rate[WLAN_BAND_NUM_MAX];
#endif
};
/**
@@ -924,252 +911,6 @@ static inline struct wlan_channel *wlan_vdev_mlme_get_des_chan(
return vdev->vdev_mlme.des_chan;
}
#ifndef CMN_VDEV_MGR_TGT_IF_ENABLE
/**
* wlan_vdev_mlme_set_ssid() - set ssid
* @vdev: VDEV object
* @ssid: SSID (input)
* @ssid_len: Length of SSID
*
* API to set the SSID of VDEV
*
* Caller need to acquire lock with wlan_vdev_obj_lock()
*
* Return: SUCCESS, if update is done
* FAILURE, if ssid length is > max ssid len
*/
static inline QDF_STATUS wlan_vdev_mlme_set_ssid(
struct wlan_objmgr_vdev *vdev,
const uint8_t *ssid, uint8_t ssid_len)
{
/* This API is invoked with lock acquired, do not add log prints */
if (ssid_len <= WLAN_SSID_MAX_LEN) {
qdf_mem_copy(vdev->vdev_mlme.ssid, ssid, ssid_len);
vdev->vdev_mlme.ssid_len = ssid_len;
} else {
vdev->vdev_mlme.ssid_len = 0;
return QDF_STATUS_E_FAILURE;
}
return QDF_STATUS_SUCCESS;
}
/**
* wlan_vdev_mlme_get_ssid() - get ssid
* @vdev: VDEV object
* @ssid: SSID
* @ssid_len: Length of SSID
*
* API to get the SSID of VDEV, it updates the SSID and its length
* in @ssid, @ssid_len respectively
*
* Caller need to acquire lock with wlan_vdev_obj_lock()
*
* Return: SUCCESS, if update is done
* FAILURE, if ssid length is > max ssid len
*/
static inline QDF_STATUS wlan_vdev_mlme_get_ssid(
struct wlan_objmgr_vdev *vdev,
uint8_t *ssid, uint8_t *ssid_len)
{
/* This API is invoked with lock acquired, do not add log prints */
if (vdev->vdev_mlme.ssid_len > 0) {
*ssid_len = vdev->vdev_mlme.ssid_len;
qdf_mem_copy(ssid, vdev->vdev_mlme.ssid, *ssid_len);
} else {
*ssid_len = 0;
return QDF_STATUS_E_FAILURE;
}
return QDF_STATUS_SUCCESS;
}
/**
* wlan_vdev_mlme_set_nss() - set NSS
* @vdev: VDEV object
* @nss: nss configured by user
*
* API to set the Number of Spatial streams
*
* Return: void
*/
static inline void wlan_vdev_mlme_set_nss(struct wlan_objmgr_vdev *vdev,
uint8_t nss)
{
vdev->vdev_mlme.nss = nss;
}
/**
* wlan_vdev_mlme_get_nss() - get NSS
* @vdev: VDEV object
*
* API to get the Number of Spatial Streams
*
* Return:
* @nss: nss value
*/
static inline uint8_t wlan_vdev_mlme_get_nss(
struct wlan_objmgr_vdev *vdev)
{
return vdev->vdev_mlme.nss;
}
/**
* wlan_vdev_mlme_set_txchainmask() - set Tx chainmask
* @vdev: VDEV object
* @chainmask : chainmask either configured by user or max supported
*
* API to set the Tx chainmask
*
* Return: void
*/
static inline void wlan_vdev_mlme_set_txchainmask(
struct wlan_objmgr_vdev *vdev,
uint8_t chainmask)
{
vdev->vdev_mlme.tx_chainmask = chainmask;
}
/**
* wlan_vdev_mlme_get_txchainmask() - get Tx chainmask
* @vdev: VDEV object
*
* API to get the Tx chainmask
*
* Return:
* @chainmask : Tx chainmask either configured by user or max supported
*/
static inline uint8_t wlan_vdev_mlme_get_txchainmask(
struct wlan_objmgr_vdev *vdev)
{
return vdev->vdev_mlme.tx_chainmask;
}
/**
* wlan_vdev_mlme_set_rxchainmask() - set Rx chainmask
* @vdev: VDEV object
* @chainmask : Rx chainmask either configured by user or max supported
*
* API to set the Rx chainmask
*
* Return: void
*/
static inline void wlan_vdev_mlme_set_rxchainmask(
struct wlan_objmgr_vdev *vdev,
uint8_t chainmask)
{
vdev->vdev_mlme.rx_chainmask = chainmask;
}
/**
* wlan_vdev_mlme_get_rxchainmask() - get Rx chainmask
* @vdev: VDEV object
*
* API to get the Rx chainmask
*
* Return:
* @chainmask : Rx chainmask either configured by user or max supported
*/
static inline uint8_t wlan_vdev_mlme_get_rxchainmask(
struct wlan_objmgr_vdev *vdev)
{
/* This API is invoked with lock acquired, do not add log prints */
return vdev->vdev_mlme.rx_chainmask;
}
/**
* wlan_vdev_mlme_set_txpower() - set tx power
* @vdev: VDEV object
* @txpow: tx power either configured by used or max allowed
*
* API to set the tx power
*
* Return: void
*/
static inline void wlan_vdev_mlme_set_txpower(
struct wlan_objmgr_vdev *vdev,
uint8_t txpow)
{
vdev->vdev_mlme.tx_power = txpow;
}
/**
* wlan_vdev_mlme_get_txpower() - get tx power
* @vdev: VDEV object
*
* API to get the tx power
*
* Return:
* @txpow: tx power either configured by used or max allowed
*/
static inline uint8_t wlan_vdev_mlme_get_txpower(
struct wlan_objmgr_vdev *vdev)
{
return vdev->vdev_mlme.tx_power;
}
/**
* wlan_vdev_mlme_set_maxrate() - set max rate
* @vdev: VDEV object
* @maxrate: configured by used or based on configured mode
*
* API to set the max rate the vdev supports
*
* Return: void
*/
static inline void wlan_vdev_mlme_set_maxrate(
struct wlan_objmgr_vdev *vdev,
uint32_t maxrate)
{
vdev->vdev_mlme.max_rate = maxrate;
}
/**
* wlan_vdev_mlme_get_maxrate() - get max rate
* @vdev: VDEV object
*
* API to get the max rate the vdev supports
*
* Return:
* @maxrate: configured by used or based on configured mode
*/
static inline uint32_t wlan_vdev_mlme_get_maxrate(
struct wlan_objmgr_vdev *vdev)
{
return vdev->vdev_mlme.max_rate;
}
/**
* wlan_vdev_mlme_set_txmgmtrate() - set txmgmtrate
* @vdev: VDEV object
* @txmgmtrate: Tx Mgmt rate
*
* API to set Mgmt Tx rate
*
* Return: void
*/
static inline void wlan_vdev_mlme_set_txmgmtrate(
struct wlan_objmgr_vdev *vdev,
uint32_t txmgmtrate)
{
vdev->vdev_mlme.tx_mgmt_rate = txmgmtrate;
}
/**
* wlan_vdev_mlme_get_txmgmtrate() - get txmgmtrate
* @vdev: VDEV object
*
* API to get Mgmt Tx rate
*
* Return:
* @txmgmtrate: Tx Mgmt rate
*/
static inline uint32_t wlan_vdev_mlme_get_txmgmtrate(
struct wlan_objmgr_vdev *vdev)
{
return vdev->vdev_mlme.tx_mgmt_rate;
}
#endif
/**
* wlan_vdev_mlme_feat_cap_set() - set feature caps
* @vdev: VDEV object