lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "qcacld-3.0: Rename hdd_adapter station info fields" into wlan-cld3.driver.lnx.2.0-dev

Browse Source
This commit is contained in:
CNSS_WLAN Service 2017-10-25 03:55:43 -07:00 committed by Gerrit - the friendly Code Review server
commit 937fe53566
8 changed files with 95 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1108,8 +1108,8 @@ struct hdd_adapter {
*/
/** Multiple station supports */
/** Per-station structure */
spinlock_t staInfo_lock; /* To protect access to station Info */
struct hdd_station_info aStaInfo[WLAN_MAX_STA_COUNT];
spinlock_t sta_info_lock; /* To protect access to station Info */
struct hdd_station_info sta_info[WLAN_MAX_STA_COUNT];
/* uint8_t uNumActiveStation; */
/*************************************************************

30
core/hdd/src/wlan_hdd_cfg80211.c
View File

@ -4817,10 +4817,10 @@ static struct hdd_station_info *hdd_get_stainfo(struct hdd_adapter *adapter,
int i;
for (i = 0; i < WLAN_MAX_STA_COUNT; i++) {
if (!qdf_mem_cmp(&adapter->aStaInfo[i].sta_mac,
if (!qdf_mem_cmp(&adapter->sta_info[i].sta_mac,
&mac_addr,
QDF_MAC_ADDR_SIZE))
stainfo = &adapter->aStaInfo[i];
stainfo = &adapter->sta_info[i];
}
return stainfo;
@ -7894,11 +7894,11 @@ static int __wlan_hdd_cfg80211_get_link_properties(struct wiphy *wiphy,
adapter->device_mode == QDF_SAP_MODE) {
for (sta_id = 0; sta_id < WLAN_MAX_STA_COUNT; sta_id++) {
if (adapter->aStaInfo[sta_id].in_use &&
if (adapter->sta_info[sta_id].in_use &&
!qdf_is_macaddr_broadcast(
&adapter->aStaInfo[sta_id].sta_mac) &&
&adapter->sta_info[sta_id].sta_mac) &&
!qdf_mem_cmp(
&adapter->aStaInfo[sta_id].sta_mac.bytes,
&adapter->sta_info[sta_id].sta_mac.bytes,
peer_mac, QDF_MAC_ADDR_SIZE))
break;
}
@ -7909,10 +7909,10 @@ static int __wlan_hdd_cfg80211_get_link_properties(struct wiphy *wiphy,
return -EINVAL;
}
nss = adapter->aStaInfo[sta_id].nss;
nss = adapter->sta_info[sta_id].nss;
freq = cds_chan_to_freq(
(WLAN_HDD_GET_AP_CTX_PTR(adapter))->operatingChannel);
rate_flags = adapter->aStaInfo[sta_id].rate_flags;
rate_flags = adapter->sta_info[sta_id].rate_flags;
} else {
hdd_err("Not Associated! with mac "MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(peer_mac));
@ -18250,18 +18250,18 @@ int __wlan_hdd_cfg80211_del_station(struct wiphy *wiphy,
uint16_t i;
for (i = 0; i < WLAN_MAX_STA_COUNT; i++) {
if ((adapter->aStaInfo[i].in_use) &&
(!adapter->aStaInfo[i].
if ((adapter->sta_info[i].in_use) &&
(!adapter->sta_info[i].
is_deauth_in_progress)) {
qdf_mem_copy(
mac,
adapter->aStaInfo[i].
adapter->sta_info[i].
sta_mac.bytes,
QDF_MAC_ADDR_SIZE);
if (hdd_ipa_uc_is_enabled(hdd_ctx)) {
hdd_ipa_wlan_evt(adapter,
adapter->
aStaInfo[i].
sta_info[i].
sta_id,
HDD_IPA_CLIENT_DISCONNECT,
mac);
@ -18281,7 +18281,7 @@ int __wlan_hdd_cfg80211_del_station(struct wiphy *wiphy,
hdd_softap_sta_deauth(adapter,
pDelStaParams);
if (QDF_IS_STATUS_SUCCESS(qdf_status)) {
adapter->aStaInfo[i].
adapter->sta_info[i].
is_deauth_in_progress = true;
qdf_status =
qdf_wait_single_event(
@ -18311,7 +18311,7 @@ int __wlan_hdd_cfg80211_del_station(struct wiphy *wiphy,
HDD_IPA_CLIENT_DISCONNECT, mac);
}
if (adapter->aStaInfo[staId].is_deauth_in_progress ==
if (adapter->sta_info[staId].is_deauth_in_progress ==
true) {
hdd_debug("Skip DEL STA as deauth is in progress::"
MAC_ADDRESS_STR,
@ -18319,7 +18319,7 @@ int __wlan_hdd_cfg80211_del_station(struct wiphy *wiphy,
return -ENOENT;
}
adapter->aStaInfo[staId].is_deauth_in_progress = true;
adapter->sta_info[staId].is_deauth_in_progress = true;
hdd_debug("Delete STA with MAC::" MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(mac));
@ -18342,7 +18342,7 @@ int __wlan_hdd_cfg80211_del_station(struct wiphy *wiphy,
qdf_status = hdd_softap_sta_deauth(adapter,
pDelStaParams);
if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
adapter->aStaInfo[staId].is_deauth_in_progress =
adapter->sta_info[staId].is_deauth_in_progress =
false;
hdd_debug("STA removal failed for ::"
MAC_ADDRESS_STR,

40
core/hdd/src/wlan_hdd_hostapd.c
View File

@ -671,11 +671,11 @@ static void hdd_clear_all_sta(struct hdd_adapter *adapter,
hdd_debug("Clearing all the STA entry....");
for (staId = 0; staId < WLAN_MAX_STA_COUNT; staId++) {
if (adapter->aStaInfo[staId].in_use &&
if (adapter->sta_info[staId].in_use &&
(staId !=
(WLAN_HDD_GET_AP_CTX_PTR(adapter))->uBCStaId)) {
wlansap_populate_del_sta_params(
&adapter->aStaInfo[staId].sta_mac.
&adapter->sta_info[staId].sta_mac.
bytes[0], eSIR_MAC_DEAUTH_LEAVING_BSS_REASON,
(SIR_MAC_MGMT_DISASSOC >> 4), &del_sta_params);
@ -1516,7 +1516,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
}
}
adapter->aStaInfo[staId].ecsa_capable = pSapEvent->
adapter->sta_info[staId].ecsa_capable = pSapEvent->
sapevt.sapStationAssocReassocCompleteEvent.ecsa_capable;
if (hdd_ipa_is_enabled(hdd_ctx)) {
@ -1909,10 +1909,10 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
staId = event->staId;
if (QDF_IS_STATUS_SUCCESS(qdf_status)) {
hdd_fill_station_info(
&adapter->aStaInfo[staId],
&adapter->sta_info[staId],
event);
hdd_debug("hdd_hostapd_sap_event_cb, StaID: %d, Type: %d",
staId, adapter->aStaInfo[staId].sta_type);
staId, adapter->sta_info[staId].sta_type);
}
if (hdd_ipa_is_enabled(hdd_ctx)) {
@ -2018,7 +2018,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
adapter->hdd_vdev,
adapter->device_mode,
event->staMac.bytes,
(adapter->aStaInfo[event->staId].sta_type
(adapter->sta_info[event->staId].sta_type
== eSTA_TYPE_P2P_CLI));
if (ret)
hdd_err("Peer object "MAC_ADDRESS_STR" add fails!",
@ -2075,9 +2075,9 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
hdd_softap_deregister_sta(adapter, staId);
ap_ctx->bApActive = false;
spin_lock_bh(&adapter->staInfo_lock);
spin_lock_bh(&adapter->sta_info_lock);
for (i = 0; i < WLAN_MAX_STA_COUNT; i++) {
if (adapter->aStaInfo[i].in_use
if (adapter->sta_info[i].in_use
&& i !=
(WLAN_HDD_GET_AP_CTX_PTR(adapter))->
uBCStaId) {
@ -2085,7 +2085,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
break;
}
}
spin_unlock_bh(&adapter->staInfo_lock);
spin_unlock_bh(&adapter->sta_info_lock);
/* Start AP inactivity timer if no stations associated */
if ((0 !=
@ -4435,7 +4435,7 @@ static __iw_softap_getassoc_stamacaddr(struct net_device *dev,
union iwreq_data *wrqu, char *extra)
{
struct hdd_adapter *adapter = (netdev_priv(dev));
struct hdd_station_info *pStaInfo = adapter->aStaInfo;
struct hdd_station_info *pStaInfo = adapter->sta_info;
struct hdd_context *hdd_ctx;
char *buf;
int cnt = 0;
@ -4487,7 +4487,7 @@ static __iw_softap_getassoc_stamacaddr(struct net_device *dev,
maclist_index = sizeof(maclist_index);
left = wrqu->data.length - maclist_index;
spin_lock_bh(&adapter->staInfo_lock);
spin_lock_bh(&adapter->sta_info_lock);
while ((cnt < WLAN_MAX_STA_COUNT) && (left >= QDF_MAC_ADDR_SIZE)) {
if ((pStaInfo[cnt].in_use) &&
(!IS_BROADCAST_MAC(pStaInfo[cnt].sta_mac.bytes))) {
@ -4498,7 +4498,7 @@ static __iw_softap_getassoc_stamacaddr(struct net_device *dev,
}
cnt++;
}
spin_unlock_bh(&adapter->staInfo_lock);
spin_unlock_bh(&adapter->sta_info_lock);
*((u32 *) buf) = maclist_index;
wrqu->data.length = maclist_index;
@ -5124,7 +5124,7 @@ static int hdd_softap_get_sta_info(struct hdd_adapter *adapter,
written = scnprintf(buf, size, "\nstaId staAddress\n");
for (i = 0; i < WLAN_MAX_STA_COUNT; i++) {
struct hdd_station_info *sta = &adapter->aStaInfo[i];
struct hdd_station_info *sta = &adapter->sta_info[i];
if (written >= size - 1)
break;
@ -5258,12 +5258,12 @@ int __iw_get_softap_linkspeed(struct net_device *dev,
*/
if (wrqu->data.length < 17 || !QDF_IS_STATUS_SUCCESS(status)) {
for (i = 0; i < WLAN_MAX_STA_COUNT; i++) {
if (adapter->aStaInfo[i].in_use &&
if (adapter->sta_info[i].in_use &&
(!qdf_is_macaddr_broadcast
(&adapter->aStaInfo[i].sta_mac))) {
(&adapter->sta_info[i].sta_mac))) {
qdf_copy_macaddr(
&macAddress,
&adapter->aStaInfo[i].
&adapter->sta_info[i].
sta_mac);
status = QDF_STATUS_SUCCESS;
break;
@ -8834,20 +8834,20 @@ void hdd_sap_indicate_disconnect_for_sta(struct hdd_adapter *adapter)
}
for (sta_id = 0; sta_id < WLAN_MAX_STA_COUNT; sta_id++) {
if (adapter->aStaInfo[sta_id].in_use) {
if (adapter->sta_info[sta_id].in_use) {
hdd_debug("sta_id: %d in_use: %d %pK",
sta_id, adapter->aStaInfo[sta_id].in_use,
sta_id, adapter->sta_info[sta_id].in_use,
adapter);
if (qdf_is_macaddr_broadcast(
&adapter->aStaInfo[sta_id].sta_mac))
&adapter->sta_info[sta_id].sta_mac))
continue;
sap_event.sapHddEventCode = eSAP_STA_DISASSOC_EVENT;
qdf_mem_copy(
&sap_event.sapevt.
sapStationDisassocCompleteEvent.staMac,
&adapter->aStaInfo[sta_id].sta_mac,
&adapter->sta_info[sta_id].sta_mac,
sizeof(struct qdf_mac_addr));
sap_event.sapevt.sapStationDisassocCompleteEvent.
reason =

8
core/hdd/src/wlan_hdd_ipa.c
View File

@ -3060,13 +3060,13 @@ static int hdd_ipa_uc_disconnect_client(struct hdd_adapter *adapter)
HDD_IPA_LOG(QDF_TRACE_LEVEL_FATAL, "enter");
for (i = 0; i < WLAN_MAX_STA_COUNT; i++) {
if (qdf_is_macaddr_broadcast(&adapter->aStaInfo[i].sta_mac))
if (qdf_is_macaddr_broadcast(&adapter->sta_info[i].sta_mac))
continue;
if ((adapter->aStaInfo[i].in_use) &&
(!adapter->aStaInfo[i].is_deauth_in_progress) &&
if ((adapter->sta_info[i].in_use) &&
(!adapter->sta_info[i].is_deauth_in_progress) &&
hdd_ipa->sap_num_connected_sta) {
hdd_ipa_uc_send_evt(adapter, WLAN_CLIENT_DISCONNECT,
adapter->aStaInfo[i].sta_mac.bytes);
adapter->sta_info[i].sta_mac.bytes);
hdd_ipa->sap_num_connected_sta--;
}
}

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

@ -12406,13 +12406,13 @@ bool hdd_is_connection_in_progress(uint8_t *session_id,
(QDF_P2P_GO_MODE == adapter->device_mode)) {
for (sta_id = 0; sta_id < WLAN_MAX_STA_COUNT;
sta_id++) {
if (!((adapter->aStaInfo[sta_id].in_use)
if (!((adapter->sta_info[sta_id].in_use)
&& (OL_TXRX_PEER_STATE_CONN ==
adapter->aStaInfo[sta_id].peer_state)))
adapter->sta_info[sta_id].peer_state)))
continue;
sta_mac = (uint8_t *)
&(adapter->aStaInfo[sta_id].
&(adapter->sta_info[sta_id].
sta_mac.bytes[0]);
hdd_debug("client " MAC_ADDRESS_STR
" of SAP/GO is in middle of WPS/EAPOL exchange",

92
core/hdd/src/wlan_hdd_softap_tx_rx.c
View File

@ -354,13 +354,13 @@ static int __hdd_softap_hard_start_xmit(struct sk_buff *skb,
QDF_TRACE_LEVEL_INFO_HIGH,
"%s: Failed to find right station", __func__);
goto drop_pkt;
} else if (false == adapter->aStaInfo[STAId].in_use) {
} else if (false == adapter->sta_info[STAId].in_use) {
QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA,
QDF_TRACE_LEVEL_INFO_HIGH,
"%s: STA %d is unregistered", __func__,
STAId);
goto drop_pkt;
} else if (true == adapter->aStaInfo[STAId].
} else if (true == adapter->sta_info[STAId].
is_deauth_in_progress) {
QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA,
QDF_TRACE_LEVEL_INFO_HIGH,
@ -370,15 +370,15 @@ static int __hdd_softap_hard_start_xmit(struct sk_buff *skb,
}
if ((OL_TXRX_PEER_STATE_CONN !=
adapter->aStaInfo[STAId].peer_state)
adapter->sta_info[STAId].peer_state)
&& (OL_TXRX_PEER_STATE_AUTH !=
adapter->aStaInfo[STAId].peer_state)) {
adapter->sta_info[STAId].peer_state)) {
QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA,
QDF_TRACE_LEVEL_INFO_HIGH,
"%s: Station not connected yet", __func__);
goto drop_pkt;
} else if (OL_TXRX_PEER_STATE_CONN ==
adapter->aStaInfo[STAId].peer_state) {
adapter->sta_info[STAId].peer_state) {
if (ntohs(skb->protocol) != HDD_ETHERTYPE_802_1_X) {
QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA,
QDF_TRACE_LEVEL_INFO_HIGH,
@ -421,17 +421,17 @@ static int __hdd_softap_hard_start_xmit(struct sk_buff *skb,
qdf_net_buf_debug_acquire_skb(skb, __FILE__, __LINE__);
adapter->stats.tx_bytes += skb->len;
adapter->aStaInfo[STAId].tx_bytes += skb->len;
adapter->sta_info[STAId].tx_bytes += skb->len;
if (qdf_nbuf_is_tso(skb)) {
num_seg = qdf_nbuf_get_tso_num_seg(skb);
adapter->stats.tx_packets += num_seg;
adapter->aStaInfo[STAId].tx_packets += num_seg;
adapter->sta_info[STAId].tx_packets += num_seg;
} else {
++adapter->stats.tx_packets;
adapter->aStaInfo[STAId].tx_packets++;
adapter->sta_info[STAId].tx_packets++;
}
adapter->aStaInfo[STAId].last_tx_rx_ts = qdf_system_ticks();
adapter->sta_info[STAId].last_tx_rx_ts = qdf_system_ticks();
hdd_event_eapol_log(skb, QDF_TX);
qdf_dp_trace_log_pkt(adapter->sessionId, skb, QDF_TX,
@ -600,10 +600,10 @@ QDF_STATUS hdd_softap_init_tx_rx(struct hdd_adapter *adapter)
qdf_mem_zero(&adapter->stats, sizeof(struct net_device_stats));
spin_lock_init(&adapter->staInfo_lock);
spin_lock_init(&adapter->sta_info_lock);
for (STAId = 0; STAId < WLAN_MAX_STA_COUNT; STAId++) {
qdf_mem_zero(&adapter->aStaInfo[STAId],
qdf_mem_zero(&adapter->sta_info[STAId],
sizeof(struct hdd_station_info));
}
@ -634,21 +634,21 @@ QDF_STATUS hdd_softap_init_tx_rx_sta(struct hdd_adapter *adapter,
uint8_t sta_id,
struct qdf_mac_addr *sta_mac)
{
spin_lock_bh(&adapter->staInfo_lock);
if (adapter->aStaInfo[sta_id].in_use) {
spin_unlock_bh(&adapter->staInfo_lock);
spin_lock_bh(&adapter->sta_info_lock);
if (adapter->sta_info[sta_id].in_use) {
spin_unlock_bh(&adapter->sta_info_lock);
hdd_err("Reinit of in use station %d", sta_id);
return QDF_STATUS_E_FAILURE;
}
qdf_mem_zero(&adapter->aStaInfo[sta_id],
qdf_mem_zero(&adapter->sta_info[sta_id],
sizeof(struct hdd_station_info));
adapter->aStaInfo[sta_id].in_use = true;
adapter->aStaInfo[sta_id].is_deauth_in_progress = false;
qdf_copy_macaddr(&adapter->aStaInfo[sta_id].sta_mac, sta_mac);
adapter->sta_info[sta_id].in_use = true;
adapter->sta_info[sta_id].is_deauth_in_progress = false;
qdf_copy_macaddr(&adapter->sta_info[sta_id].sta_mac, sta_mac);
spin_unlock_bh(&adapter->staInfo_lock);
spin_unlock_bh(&adapter->sta_info_lock);
return QDF_STATUS_SUCCESS;
}
@ -660,18 +660,18 @@ QDF_STATUS hdd_softap_deinit_tx_rx_sta(struct hdd_adapter *adapter,
hostapd_state = WLAN_HDD_GET_HOSTAP_STATE_PTR(adapter);
spin_lock_bh(&adapter->staInfo_lock);
spin_lock_bh(&adapter->sta_info_lock);
if (false == adapter->aStaInfo[sta_id].in_use) {
spin_unlock_bh(&adapter->staInfo_lock);
if (false == adapter->sta_info[sta_id].in_use) {
spin_unlock_bh(&adapter->sta_info_lock);
hdd_err("Deinit station not inited %d", sta_id);
return QDF_STATUS_E_FAILURE;
}
adapter->aStaInfo[sta_id].in_use = false;
adapter->aStaInfo[sta_id].is_deauth_in_progress = false;
adapter->sta_info[sta_id].in_use = false;
adapter->sta_info[sta_id].is_deauth_in_progress = false;
spin_unlock_bh(&adapter->staInfo_lock);
spin_unlock_bh(&adapter->sta_info_lock);
return status;
}
@ -754,9 +754,9 @@ QDF_STATUS hdd_softap_rx_packet_cbk(void *context, qdf_nbuf_t rxBuf)
if (QDF_STATUS_SUCCESS ==
hdd_softap_get_sta_id(adapter, &src_mac, &staid)) {
if (staid < WLAN_MAX_STA_COUNT) {
adapter->aStaInfo[staid].rx_packets++;
adapter->aStaInfo[staid].rx_bytes += skb->len;
adapter->aStaInfo[staid].last_tx_rx_ts =
adapter->sta_info[staid].rx_packets++;
adapter->sta_info[staid].rx_bytes += skb->len;
adapter->sta_info[staid].last_tx_rx_ts =
qdf_system_ticks();
}
}
@ -854,17 +854,17 @@ QDF_STATUS hdd_softap_deregister_sta(struct hdd_adapter *adapter,
}
ret = hdd_objmgr_remove_peer_object(adapter->hdd_vdev,
adapter->aStaInfo[staId].
adapter->sta_info[staId].
sta_mac.bytes);
if (ret)
hdd_err("Peer obj %pM delete fails",
adapter->aStaInfo[staId].sta_mac.bytes);
adapter->sta_info[staId].sta_mac.bytes);
if (adapter->aStaInfo[staId].in_use) {
spin_lock_bh(&adapter->staInfo_lock);
qdf_mem_zero(&adapter->aStaInfo[staId],
if (adapter->sta_info[staId].in_use) {
spin_lock_bh(&adapter->sta_info_lock);
qdf_mem_zero(&adapter->sta_info[staId],
sizeof(struct hdd_station_info));
spin_unlock_bh(&adapter->staInfo_lock);
spin_unlock_bh(&adapter->sta_info_lock);
}
hdd_ctx->sta_to_adapter[staId] = NULL;
@ -907,7 +907,7 @@ QDF_STATUS hdd_softap_register_sta(struct hdd_adapter *adapter,
/*
* Clean up old entry if it is not cleaned up properly
*/
if (adapter->aStaInfo[staId].in_use) {
if (adapter->sta_info[staId].in_use) {
hdd_info("clean up old entry for STA %d", staId);
hdd_softap_deregister_sta(adapter, staId);
}
@ -950,12 +950,12 @@ QDF_STATUS hdd_softap_register_sta(struct hdd_adapter *adapter,
* put TL directly into 'authenticated' state
*/
adapter->aStaInfo[staId].sta_id = staId;
adapter->aStaInfo[staId].is_qos_enabled = fWmmEnabled;
adapter->sta_info[staId].sta_id = staId;
adapter->sta_info[staId].is_qos_enabled = fWmmEnabled;
if (!fAuthRequired) {
hdd_info("open/shared auth StaId= %d. Changing TL state to AUTHENTICATED at Join time",
adapter->aStaInfo[staId].sta_id);
adapter->sta_info[staId].sta_id);
/* Connections that do not need Upper layer auth,
* transition TL directly to 'Authenticated' state.
@ -963,16 +963,16 @@ QDF_STATUS hdd_softap_register_sta(struct hdd_adapter *adapter,
qdf_status = hdd_change_peer_state(adapter, staDesc.sta_id,
OL_TXRX_PEER_STATE_AUTH, false);
adapter->aStaInfo[staId].peer_state = OL_TXRX_PEER_STATE_AUTH;
adapter->sta_info[staId].peer_state = OL_TXRX_PEER_STATE_AUTH;
adapter->sessionCtx.ap.uIsAuthenticated = true;
} else {
hdd_info("ULA auth StaId= %d. Changing TL state to CONNECTED at Join time",
adapter->aStaInfo[staId].sta_id);
adapter->sta_info[staId].sta_id);
qdf_status = hdd_change_peer_state(adapter, staDesc.sta_id,
OL_TXRX_PEER_STATE_CONN, false);
adapter->aStaInfo[staId].peer_state = OL_TXRX_PEER_STATE_CONN;
adapter->sta_info[staId].peer_state = OL_TXRX_PEER_STATE_CONN;
adapter->sessionCtx.ap.uIsAuthenticated = false;
@ -1059,7 +1059,7 @@ QDF_STATUS hdd_softap_stop_bss(struct hdd_adapter *adapter)
for (staId = 0; staId < WLAN_MAX_STA_COUNT; staId++) {
/* This excludes BC sta as it is already deregistered */
if (adapter->aStaInfo[staId].in_use) {
if (adapter->sta_info[staId].in_use) {
qdf_status = hdd_softap_deregister_sta(adapter, staId);
if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
hdd_err("Failed to deregister sta Id %d",
@ -1094,7 +1094,7 @@ QDF_STATUS hdd_softap_change_sta_state(struct hdd_adapter *adapter,
}
if (false ==
qdf_is_macaddr_equal(&adapter->aStaInfo[sta_id].sta_mac,
qdf_is_macaddr_equal(&adapter->sta_info[sta_id].sta_mac,
pDestMacAddress)) {
hdd_err("Station %u MAC address not matching", sta_id);
return QDF_STATUS_E_FAILURE;
@ -1105,7 +1105,7 @@ QDF_STATUS hdd_softap_change_sta_state(struct hdd_adapter *adapter,
hdd_info("Station %u changed to state %d", sta_id, state);
if (QDF_STATUS_SUCCESS == qdf_status) {
adapter->aStaInfo[sta_id].peer_state =
adapter->sta_info[sta_id].peer_state =
OL_TXRX_PEER_STATE_AUTH;
p2p_peer_authorized(adapter->hdd_vdev, pDestMacAddress->bytes);
}
@ -1132,8 +1132,8 @@ QDF_STATUS hdd_softap_get_sta_id(struct hdd_adapter *adapter,
for (i = 0; i < WLAN_MAX_STA_COUNT; i++) {
if (!qdf_mem_cmp
(&adapter->aStaInfo[i].sta_mac, pMacAddress,
QDF_MAC_ADDR_SIZE) && adapter->aStaInfo[i].in_use) {
(&adapter->sta_info[i].sta_mac, pMacAddress,
QDF_MAC_ADDR_SIZE) && adapter->sta_info[i].in_use) {
*staId = i;
return QDF_STATUS_SUCCESS;
}

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

@ -3835,10 +3835,10 @@ int wlan_hdd_get_station_remote(struct wiphy *wiphy,
hdd_debug("get peer %pM info", mac);
for (i = 0; i < WLAN_MAX_STA_COUNT; i++) {
if (!qdf_mem_cmp(adapter->aStaInfo[i].sta_mac.bytes,
if (!qdf_mem_cmp(adapter->sta_info[i].sta_mac.bytes,
mac,
QDF_MAC_ADDR_SIZE)) {
stainfo = &adapter->aStaInfo[i];
stainfo = &adapter->sta_info[i];
break;
}
}

6
core/hdd/src/wlan_hdd_wext.c
View File

@ -4491,10 +4491,10 @@ int hdd_set_peer_rate(struct hdd_adapter *adapter, int set_value)
hdd_get_aid_rc(&aid, &rc, set_value);
if ((adapter->aStaInfo[aid].in_use) &&
(OL_TXRX_PEER_STATE_CONN == adapter->aStaInfo[aid].peer_state)) {
if ((adapter->sta_info[aid].in_use) &&
(OL_TXRX_PEER_STATE_CONN == adapter->sta_info[aid].peer_state)) {
peer_mac =
(uint8_t *)&(adapter->aStaInfo[aid].sta_mac.bytes[0]);
(uint8_t *)&(adapter->sta_info[aid].sta_mac.bytes[0]);
hdd_info("Peer AID: %d MAC_ADDR: "MAC_ADDRESS_STR,
aid, MAC_ADDR_ARRAY(peer_mac));
} else {