samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: Add missed calling of wlan_hdd_get_station_remote

Browse Source 
Propagation from qcacld-2.0 to qcacld-3.0

For the sap role, .get_station would invoke
wlan_hdd_get_station_remote() or wlan_hdd_get_sap_stats(), depends on
"gSapGetPeerInfo" ini setting. And fix the logic of determine sap get
peer info enable or not by target capability.

CRs-Fixed: 2427627
Change-Id: I3162950a6a7202d55b64ff9c60a26971d3a31555
This commit is contained in:
Will Huang
2019-04-02 14:52:17 +08:00
committed by nshrivas
parent 124a444ae3
commit b9cb12421a
6 changed files with 108 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
components/mlme/dispatcher/inc/wlan_mlme_api.h
View File

@@ -533,6 +533,16 @@ QDF_STATUS wlan_mlme_set_rmc_action_period_freq(struct wlan_objmgr_psoc *psoc,
QDF_STATUS wlan_mlme_get_sap_get_peer_info(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_get_sap_get_peer_info(struct wlan_objmgr_psoc *psoc,
bool *value); bool *value);
/**
* wlan_mlme_set_sap_get_peer_info() - set the sap get peer info
* @psoc: pointer to psoc object
* @value: value to overwrite the sap get peer info
*
* Return: QDF Status
*/
QDF_STATUS wlan_mlme_set_sap_get_peer_info(struct wlan_objmgr_psoc *psoc,
bool value);
/** /**
* wlan_mlme_is_sap_bcast_deauth_enabled() - get the enable/disable value * wlan_mlme_is_sap_bcast_deauth_enabled() - get the enable/disable value
* for broadcast deauth in sap * for broadcast deauth in sap

16
components/mlme/dispatcher/inc/wlan_mlme_ucfg_api.h
View File

@@ -1397,6 +1397,22 @@ QDF_STATUS ucfg_mlme_get_sap_get_peer_info(struct wlan_objmgr_psoc *psoc,
return wlan_mlme_get_sap_get_peer_info(psoc, value); return wlan_mlme_get_sap_get_peer_info(psoc, value);
} }
/**
* ucfg_mlme_set_sap_get_peer_info() - set the sap get peer info
* @psoc: pointer to psoc object
* @value: value to overwrite the sap get peer info
*
* Inline UCFG API to be used by HDD/OSIF callers
*
* Return: QDF Status
*/
static inline
QDF_STATUS ucfg_mlme_set_sap_get_peer_info(struct wlan_objmgr_psoc *psoc,
bool value)
{
return wlan_mlme_set_sap_get_peer_info(psoc, value);
}
/** /**
* ucfg_mlme_is_sap_bcast_deauth_enabled() - get the sap bcast deauth * ucfg_mlme_is_sap_bcast_deauth_enabled() - get the sap bcast deauth
* enabled value * enabled value

14
components/mlme/dispatcher/src/wlan_mlme_api.c
View File

@@ -1611,6 +1611,20 @@ QDF_STATUS wlan_mlme_get_sap_get_peer_info(struct wlan_objmgr_psoc *psoc,
return QDF_STATUS_SUCCESS; return QDF_STATUS_SUCCESS;
} }
QDF_STATUS wlan_mlme_set_sap_get_peer_info(struct wlan_objmgr_psoc *psoc,
bool value)
{
struct wlan_mlme_psoc_obj *mlme_obj;
mlme_obj = mlme_get_psoc_obj(psoc);
if (!mlme_obj)
return QDF_STATUS_E_FAILURE;
mlme_obj->cfg.sap_cfg.sap_get_peer_info = value;
return QDF_STATUS_SUCCESS;
}
QDF_STATUS QDF_STATUS
wlan_mlme_is_sap_bcast_deauth_enabled(struct wlan_objmgr_psoc *psoc, wlan_mlme_is_sap_bcast_deauth_enabled(struct wlan_objmgr_psoc *psoc,
bool *value) bool *value)

2
core/hdd/inc/wlan_hdd_main.h
View File

@@ -962,7 +962,6 @@ struct hdd_station_info {
* @vendor_acs_timer: Timer for ACS * @vendor_acs_timer: Timer for ACS
* @vendor_acs_timer_initialized: Is @vendor_acs_timer initialized? * @vendor_acs_timer_initialized: Is @vendor_acs_timer initialized?
* @bss_stop_reason: Reason why the BSS was stopped * @bss_stop_reason: Reason why the BSS was stopped
* @txrx_stats: TX RX statistics from firmware
* @acs_in_progress: In progress acs flag for an adapter * @acs_in_progress: In progress acs flag for an adapter
*/ */
struct hdd_ap_ctx { struct hdd_ap_ctx {
@@ -983,7 +982,6 @@ struct hdd_ap_ctx {
qdf_mc_timer_t vendor_acs_timer; qdf_mc_timer_t vendor_acs_timer;
bool vendor_acs_timer_initialized; bool vendor_acs_timer_initialized;
enum bss_stop_reason bss_stop_reason; enum bss_stop_reason bss_stop_reason;
struct hdd_fw_txrx_stats txrx_stats;
qdf_atomic_t acs_in_progress; qdf_atomic_t acs_in_progress;
}; };

11
core/hdd/src/wlan_hdd_main.c
View File

@@ -1357,7 +1357,7 @@ static void hdd_update_tgt_services(struct hdd_context *hdd_ctx,
bool tdls_buffer_sta; bool tdls_buffer_sta;
uint32_t tdls_uapsd_mask; uint32_t tdls_uapsd_mask;
#endif #endif
bool value; bool get_peer_info_enable;
/* Set up UAPSD */ /* Set up UAPSD */
ucfg_mlme_set_sap_uapsd_flag(hdd_ctx->psoc, cfg->uapsd); ucfg_mlme_set_sap_uapsd_flag(hdd_ctx->psoc, cfg->uapsd);
@@ -1406,9 +1406,12 @@ static void hdd_update_tgt_services(struct hdd_context *hdd_ctx,
#endif #endif
hdd_update_roam_offload(hdd_ctx, cfg); hdd_update_roam_offload(hdd_ctx, cfg);
if (ucfg_mlme_get_sap_get_peer_info(hdd_ctx->psoc, &value) == if (ucfg_mlme_get_sap_get_peer_info(
QDF_STATUS_SUCCESS) hdd_ctx->psoc, &get_peer_info_enable) == QDF_STATUS_SUCCESS) {
value &= cfg->get_peer_info_enabled; get_peer_info_enable &= cfg->get_peer_info_enabled;
ucfg_mlme_set_sap_get_peer_info(hdd_ctx->psoc,
get_peer_info_enable);
}
ucfg_mlme_is_mawc_enabled(hdd_ctx->psoc, &mawc_enabled); ucfg_mlme_is_mawc_enabled(hdd_ctx->psoc, &mawc_enabled);
ucfg_mlme_set_mawc_enabled(hdd_ctx->psoc, ucfg_mlme_set_mawc_enabled(hdd_ctx->psoc,

126
core/hdd/src/wlan_hdd_stats.c
View File

@@ -3795,89 +3795,80 @@ static uint8_t hdd_get_rate_flags(uint32_t rate,
/** /**
* wlan_hdd_fill_rate_info() - fill HDD rate info from SIR peer info * wlan_hdd_fill_rate_info() - fill HDD rate info from SIR peer info
* @ap_ctx: AP Context * @txrx_stats: pointer to txrx stats to be filled with rate info
* @peer_info: SIR peer info pointer * @peer_info: SIR peer info pointer
* *
* This function is used to fill HDD rate info rom SIR peer info * This function is used to fill HDD rate info rom SIR peer info
* *
* Return: None * Return: None
*/ */
static void wlan_hdd_fill_rate_info(struct hdd_ap_ctx *ap_ctx, static void wlan_hdd_fill_rate_info(struct hdd_fw_txrx_stats *txrx_stats,
struct sir_peer_info_ext *peer_info) struct sir_peer_info_ext *peer_info)
{ {
uint8_t flags; uint8_t flags;
uint32_t rate_code; uint32_t rate_code;
/* tx rate info */ /* tx rate info */
ap_ctx->txrx_stats.tx_rate.rate = peer_info->tx_rate; txrx_stats->tx_rate.rate = peer_info->tx_rate;
rate_code = peer_info->tx_rate_code; rate_code = peer_info->tx_rate_code;
if ((WMI_GET_HW_RATECODE_PREAM_V1(rate_code)) == if ((WMI_GET_HW_RATECODE_PREAM_V1(rate_code)) ==
WMI_RATE_PREAMBLE_HT) WMI_RATE_PREAMBLE_HT)
ap_ctx->txrx_stats.tx_rate.mode = SIR_SME_PHY_MODE_HT; txrx_stats->tx_rate.mode = SIR_SME_PHY_MODE_HT;
else if ((WMI_GET_HW_RATECODE_PREAM_V1(rate_code)) == else if ((WMI_GET_HW_RATECODE_PREAM_V1(rate_code)) ==
WMI_RATE_PREAMBLE_VHT) WMI_RATE_PREAMBLE_VHT)
ap_ctx->txrx_stats.tx_rate.mode = SIR_SME_PHY_MODE_VHT; txrx_stats->tx_rate.mode = SIR_SME_PHY_MODE_VHT;
else else
ap_ctx->txrx_stats.tx_rate.mode = SIR_SME_PHY_MODE_LEGACY; txrx_stats->tx_rate.mode = SIR_SME_PHY_MODE_LEGACY;
ap_ctx->txrx_stats.tx_rate.nss = txrx_stats->tx_rate.nss = WMI_GET_HW_RATECODE_NSS_V1(rate_code) + 1;
WMI_GET_HW_RATECODE_NSS_V1(rate_code) + 1; txrx_stats->tx_rate.mcs = WMI_GET_HW_RATECODE_RATE_V1(rate_code);
ap_ctx->txrx_stats.tx_rate.mcs =
WMI_GET_HW_RATECODE_RATE_V1(rate_code);
flags = hdd_get_rate_flags(ap_ctx->txrx_stats.tx_rate.rate / 100, flags = hdd_get_rate_flags(txrx_stats->tx_rate.rate / 100,
ap_ctx->txrx_stats.tx_rate.mode, txrx_stats->tx_rate.mode,
ap_ctx->txrx_stats.tx_rate.nss, txrx_stats->tx_rate.nss,
ap_ctx->txrx_stats.tx_rate.mcs); txrx_stats->tx_rate.mcs);
ap_ctx->txrx_stats.tx_rate.rate_flags = flags; txrx_stats->tx_rate.rate_flags = flags;
hdd_debug("tx: mode %d nss %d mcs %d rate_flags %x flags %x", hdd_debug("tx: mode %d nss %d mcs %d rate_flags %x flags %x",
ap_ctx->txrx_stats.tx_rate.mode, txrx_stats->tx_rate.mode,
ap_ctx->txrx_stats.tx_rate.nss, txrx_stats->tx_rate.nss,
ap_ctx->txrx_stats.tx_rate.mcs, txrx_stats->tx_rate.mcs,
ap_ctx->txrx_stats.tx_rate.rate_flags, txrx_stats->tx_rate.rate_flags,
flags); flags);
/* rx rate info */ /* rx rate info */
ap_ctx->txrx_stats.rx_rate.rate = peer_info->rx_rate; txrx_stats->rx_rate.rate = peer_info->rx_rate;
rate_code = peer_info->rx_rate_code; rate_code = peer_info->rx_rate_code;
if ((WMI_GET_HW_RATECODE_PREAM_V1(rate_code)) == if ((WMI_GET_HW_RATECODE_PREAM_V1(rate_code)) ==
WMI_RATE_PREAMBLE_HT) WMI_RATE_PREAMBLE_HT)
ap_ctx->txrx_stats.rx_rate.mode = SIR_SME_PHY_MODE_HT; txrx_stats->rx_rate.mode = SIR_SME_PHY_MODE_HT;
else if ((WMI_GET_HW_RATECODE_PREAM_V1(rate_code)) == else if ((WMI_GET_HW_RATECODE_PREAM_V1(rate_code)) ==
WMI_RATE_PREAMBLE_VHT) WMI_RATE_PREAMBLE_VHT)
ap_ctx->txrx_stats.rx_rate.mode = SIR_SME_PHY_MODE_VHT; txrx_stats->rx_rate.mode = SIR_SME_PHY_MODE_VHT;
else else
ap_ctx->txrx_stats.rx_rate.mode = SIR_SME_PHY_MODE_LEGACY; txrx_stats->rx_rate.mode = SIR_SME_PHY_MODE_LEGACY;
ap_ctx->txrx_stats.rx_rate.nss = txrx_stats->rx_rate.nss = WMI_GET_HW_RATECODE_NSS_V1(rate_code) + 1;
WMI_GET_HW_RATECODE_NSS_V1(rate_code) + 1; txrx_stats->rx_rate.mcs = WMI_GET_HW_RATECODE_RATE_V1(rate_code);
ap_ctx->txrx_stats.rx_rate.mcs =
WMI_GET_HW_RATECODE_RATE_V1(rate_code);
flags = hdd_get_rate_flags(ap_ctx->txrx_stats.rx_rate.rate / 100, flags = hdd_get_rate_flags(txrx_stats->rx_rate.rate / 100,
ap_ctx->txrx_stats.rx_rate.mode, txrx_stats->rx_rate.mode,
ap_ctx->txrx_stats.rx_rate.nss, txrx_stats->rx_rate.nss,
ap_ctx->txrx_stats.rx_rate.mcs); txrx_stats->rx_rate.mcs);
ap_ctx->txrx_stats.rx_rate.rate_flags = flags; txrx_stats->rx_rate.rate_flags = flags;
hdd_info("rx: mode %d nss %d mcs %d rate_flags %x flags %x", hdd_info("rx: mode %d nss %d mcs %d rate_flags %x flags %x",
ap_ctx->txrx_stats.rx_rate.mode, txrx_stats->rx_rate.mode,
ap_ctx->txrx_stats.rx_rate.nss, txrx_stats->rx_rate.nss,
ap_ctx->txrx_stats.rx_rate.mcs, txrx_stats->rx_rate.mcs,
ap_ctx->txrx_stats.rx_rate.rate_flags, txrx_stats->rx_rate.rate_flags,
flags); flags);
} }
int wlan_hdd_get_station_remote(struct wiphy *wiphy,
struct net_device *dev,
const u8 *mac,
struct station_info *sinfo);
/** /**
* wlan_hdd_get_station_remote() - NL80211_CMD_GET_STATION handler for SoftAP * wlan_hdd_get_station_remote() - NL80211_CMD_GET_STATION handler for SoftAP
* @wiphy: pointer to wiphy * @wiphy: pointer to wiphy
@@ -3889,18 +3880,17 @@ int wlan_hdd_get_station_remote(struct wiphy *wiphy,
* *
* Return: 0 on success, otherwise error value * Return: 0 on success, otherwise error value
*/ */
int wlan_hdd_get_station_remote(struct wiphy *wiphy, static int wlan_hdd_get_station_remote(struct wiphy *wiphy,
struct net_device *dev, struct net_device *dev,
const u8 *mac, const u8 *mac,
struct station_info *sinfo) struct station_info *sinfo)
{ {
struct hdd_adapter *adapter = WLAN_HDD_GET_PRIV_PTR(dev); struct hdd_adapter *adapter = WLAN_HDD_GET_PRIV_PTR(dev);
struct hdd_context *hddctx = wiphy_priv(wiphy); struct hdd_context *hddctx = wiphy_priv(wiphy);
struct hdd_ap_ctx *ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter);
struct hdd_station_info *stainfo = NULL; struct hdd_station_info *stainfo = NULL;
struct hdd_config *cfg;
struct qdf_mac_addr macaddr; struct qdf_mac_addr macaddr;
struct sir_peer_info_ext peer_info; struct sir_peer_info_ext peer_info;
struct hdd_fw_txrx_stats txrx_stats;
int status; int status;
int i; int i;
@@ -3908,8 +3898,6 @@ int wlan_hdd_get_station_remote(struct wiphy *wiphy,
if (status != 0) if (status != 0)
return status; return status;
cfg = hddctx->config;
hdd_debug("get peer %pM info", mac); hdd_debug("get peer %pM info", mac);
for (i = 0; i < WLAN_MAX_STA_COUNT; i++) { for (i = 0; i < WLAN_MAX_STA_COUNT; i++) {
@@ -3933,19 +3921,16 @@ int wlan_hdd_get_station_remote(struct wiphy *wiphy,
return -EPERM; return -EPERM;
} }
qdf_mem_zero(&ap_ctx->txrx_stats, sizeof(ap_ctx->txrx_stats)); qdf_mem_zero(&txrx_stats, sizeof(txrx_stats));
ap_ctx->txrx_stats.tx_packets = peer_info.tx_packets; txrx_stats.tx_packets = peer_info.tx_packets;
ap_ctx->txrx_stats.tx_bytes = peer_info.tx_bytes; txrx_stats.tx_bytes = peer_info.tx_bytes;
ap_ctx->txrx_stats.rx_packets = peer_info.rx_packets; txrx_stats.rx_packets = peer_info.rx_packets;
ap_ctx->txrx_stats.rx_bytes = peer_info.rx_bytes; txrx_stats.rx_bytes = peer_info.rx_bytes;
ap_ctx->txrx_stats.tx_retries = peer_info.tx_retries; txrx_stats.tx_retries = peer_info.tx_retries;
ap_ctx->txrx_stats.tx_failed = peer_info.tx_failed; txrx_stats.tx_failed = peer_info.tx_failed;
ap_ctx->txrx_stats.rssi = txrx_stats.rssi = peer_info.rssi + WLAN_HDD_TGT_NOISE_FLOOR_DBM;
peer_info.rssi + WLAN_HDD_TGT_NOISE_FLOOR_DBM; wlan_hdd_fill_rate_info(&txrx_stats, &peer_info);
wlan_hdd_fill_rate_info(ap_ctx, &peer_info); wlan_hdd_fill_station_info(hddctx->psoc, sinfo, stainfo, &txrx_stats);
wlan_hdd_fill_station_info(hddctx->psoc, sinfo, stainfo,
&ap_ctx->txrx_stats);
return status; return status;
} }
@@ -4614,7 +4599,9 @@ static int __wlan_hdd_cfg80211_get_station(struct wiphy *wiphy,
{ {
int status; int status;
struct hdd_adapter *adapter = WLAN_HDD_GET_PRIV_PTR(dev); struct hdd_adapter *adapter = WLAN_HDD_GET_PRIV_PTR(dev);
struct hdd_context *hdd_ctx = (struct hdd_context *) wiphy_priv(wiphy); struct hdd_context *hdd_ctx = wiphy_priv(wiphy);
bool get_peer_info_enable;
QDF_STATUS qdf_status;
hdd_enter_dev(dev); hdd_enter_dev(dev);
@@ -4630,10 +4617,19 @@ static int __wlan_hdd_cfg80211_get_station(struct wiphy *wiphy,
if (wlan_hdd_validate_vdev_id(adapter->vdev_id)) if (wlan_hdd_validate_vdev_id(adapter->vdev_id))
return -EINVAL; return -EINVAL;
if (adapter->device_mode == QDF_SAP_MODE) if (adapter->device_mode == QDF_SAP_MODE) {
qdf_status = ucfg_mlme_get_sap_get_peer_info(
hdd_ctx->psoc, &get_peer_info_enable);
if (qdf_status == QDF_STATUS_SUCCESS && get_peer_info_enable) {
status = wlan_hdd_get_station_remote(wiphy, dev,
mac, sinfo);
if (!status)
return 0;
}
return wlan_hdd_get_sap_stats(adapter, sinfo); return wlan_hdd_get_sap_stats(adapter, sinfo);
else } else {
return wlan_hdd_get_sta_stats(wiphy, adapter, mac, sinfo); return wlan_hdd_get_sta_stats(wiphy, adapter, mac, sinfo);
}
} }
/** /**