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 isQosEnabled field" into wlan-cld3.driver.lnx.2.0-dev

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

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

@ -776,7 +776,7 @@ struct hdd_fw_txrx_stats {
* @macAddrSTA: 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.
* @isQosEnabled: Track QoS status of station
* @is_qos_enabled: Track QoS status of station
* @is_deauth_in_progress: The station entry for which Deauth is in progress
* @nss: Number of spatial streams supported
* @rate_flags: Rate Flags for this connection
@ -808,7 +808,7 @@ struct hdd_station_info {
eStationType staType;
struct qdf_mac_addr macAddrSTA;
enum ol_txrx_peer_state peer_state;
bool isQosEnabled;
bool is_qos_enabled;
bool is_deauth_in_progress;
uint8_t nss;
uint32_t rate_flags;

6
core/hdd/src/wlan_hdd_cfg80211.c
View file

@ -4874,7 +4874,7 @@ static int hdd_get_station_remote(struct hdd_context *hdd_ctx,
(sizeof(stainfo->tx_bytes) + NLA_HDRLEN) +
(sizeof(stainfo->rx_packets) + NLA_HDRLEN) +
(sizeof(stainfo->rx_bytes) + NLA_HDRLEN) +
(sizeof(stainfo->isQosEnabled) + NLA_HDRLEN) +
(sizeof(stainfo->is_qos_enabled) + NLA_HDRLEN) +
(sizeof(stainfo->mode) + NLA_HDRLEN);
if (!hdd_ctx->config->sap_get_peer_info ||
@ -4917,7 +4917,7 @@ static int hdd_get_station_remote(struct hdd_context *hdd_ctx,
stainfo->ampdu, stainfo->tx_stbc,
stainfo->rx_stbc);
hdd_info("wmm %d chwidth %d sgi %d",
stainfo->isQosEnabled,
stainfo->is_qos_enabled,
stainfo->ch_width,
stainfo->sgi_enable);
}
@ -4927,7 +4927,7 @@ static int hdd_get_station_remote(struct hdd_context *hdd_ctx,
remote_station_put_u64(skb, REMOTE_TX_BYTES, stainfo->tx_bytes) ||
nla_put_u32(skb, REMOTE_RX_PACKETS, stainfo->rx_packets) ||
remote_station_put_u64(skb, REMOTE_RX_BYTES, stainfo->rx_bytes) ||
nla_put_u8(skb, REMOTE_WMM, stainfo->isQosEnabled) ||
nla_put_u8(skb, REMOTE_WMM, stainfo->is_qos_enabled) ||
nla_put_u8(skb, REMOTE_SUPPORTED_MODE, stainfo->mode)) {
hdd_err("put fail");
goto fail;

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

@ -1317,7 +1317,7 @@ static void hdd_fill_station_info(struct hdd_station_info *stainfo,
stainfo->sgi_enable,
stainfo->tx_stbc,
stainfo->rx_stbc,
stainfo->isQosEnabled,
stainfo->is_qos_enabled,
stainfo->ch_width,
stainfo->mode,
event->wmmEnabled,

2
core/hdd/src/wlan_hdd_softap_tx_rx.c
View file

@ -968,7 +968,7 @@ QDF_STATUS hdd_softap_register_sta(struct hdd_adapter *adapter,
*/
adapter->aStaInfo[staId].ucSTAId = staId;
adapter->aStaInfo[staId].isQosEnabled = fWmmEnabled;
adapter->aStaInfo[staId].is_qos_enabled = fWmmEnabled;
if (!fAuthRequired) {
hdd_info("open/shared auth StaId= %d. Changing TL state to AUTHENTICATED at Join time",