A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-14 16:46:15 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "qcacld-3.0: Rename hdd_station_info staType field" into wlan-cld3.driver.lnx.2.0-dev

Browse source
This commit is contained in:
CNSS_WLAN Service 2017-10-25 03:55:42 -07:00 • committed by Gerrit - the friendly Code Review server
commit 4ca9a4b38d
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -772,7 +772,7 @@ struct hdd_fw_txrx_stats {
* @in_use: Is the station entry in use?
* @sta_id: Station ID reported back from HAL (through SAP).
* Broadcast uses station ID zero by default.
* @staType: Type of station i.e. p2p client or infrastructure station
* @sta_type: Type of station i.e. p2p client or infrastructure station
* @sta_mac: MAC address of the station
* @peer_state: Current Station state so HDD knows how to deal with packet
* queue. Most recent states used to change TLSHIM STA state.
@ -805,7 +805,7 @@ struct hdd_fw_txrx_stats {
struct hdd_station_info {
bool in_use;
uint8_t sta_id;
eStationType staType;
eStationType sta_type;
struct qdf_mac_addr sta_mac;
enum ol_txrx_peer_state peer_state;
bool is_qos_enabled;

8
core/hdd/src/wlan_hdd_hostapd.c
View file

@ -1286,7 +1286,7 @@ static int calcuate_max_phy_rate(int mode, int nss, int ch_width,
static void hdd_fill_station_info(struct hdd_station_info *stainfo,
tSap_StationAssocReassocCompleteEvent *event)
{
stainfo->staType = event->staType;
stainfo->sta_type = event->staType;
stainfo->nss = event->chan_info.nss;
stainfo->rate_flags = event->chan_info.rate_flags;
stainfo->ampdu = event->ampdu;
@ -1911,8 +1911,8 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
hdd_fill_station_info(
&adapter->aStaInfo[staId],
event);
hdd_debug("hdd_hostapd_sap_event_cb, StaID: %d, StaType: %d",
staId, adapter->aStaInfo[staId].staType);
hdd_debug("hdd_hostapd_sap_event_cb, StaID: %d, Type: %d",
staId, adapter->aStaInfo[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].staType
(adapter->aStaInfo[event->staId].sta_type
== eSTA_TYPE_P2P_CLI));
if (ret)
hdd_err("Peer object "MAC_ADDRESS_STR" add fails!",