From 82ceb08c9aabcc825bce4da72b0c55fa5ed8f519 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Fri, 27 Oct 2017 14:52:42 -0700 Subject: [PATCH] qcacld-3.0: Rename hdd_ap_ctx apDisableIntraBssFwd field Per the Linux coding style "mixed-case names are frowned upon" so rename field apDisableIntraBssFwd in struct hdd_ap_ctx. Change-Id: If2442e605a95c8d82df8adf1395e4ed6b53bbbd5 CRs-Fixed: 2134923 --- core/hdd/inc/wlan_hdd_main.h | 3 ++- core/hdd/src/wlan_hdd_cfg80211.c | 4 ++-- core/hdd/src/wlan_hdd_ipa.c | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h index 8bdb86883c31..7ea0dc3398de 100644 --- a/core/hdd/inc/wlan_hdd_main.h +++ b/core/hdd/inc/wlan_hdd_main.h @@ -809,11 +809,13 @@ struct hdd_station_info { /** * struct hdd_ap_ctx - SAP/P2PGO specific information * @hostapd_state: state control information + * @disable_intrabss_fwd: Prevent forwarding between stations * @broadcast_sta_id: Station ID assigned after BSS starts * @privacy: The privacy bits of configuration */ struct hdd_ap_ctx { struct hdd_hostapd_state hostapd_state; + bool disable_intrabss_fwd; uint8_t broadcast_sta_id; uint8_t privacy; @@ -823,7 +825,6 @@ struct hdd_ap_ctx { struct semaphore semWpsPBCOverlapInd; - bool apDisableIntraBssFwd; qdf_mc_timer_t hdd_ap_inactivity_timer; diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index 1c1484b5ce83..9ae55dabb94d 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -13740,14 +13740,14 @@ static int __wlan_hdd_cfg80211_change_bss(struct wiphy *wiphy, * want to update this parameter */ if (-1 != params->ap_isolate) { - adapter->sessionCtx.ap.apDisableIntraBssFwd = + adapter->sessionCtx.ap.disable_intrabss_fwd = !!params->ap_isolate; qdf_ret_status = sme_ap_disable_intra_bss_fwd(hdd_ctx->hHal, adapter->sessionId, adapter->sessionCtx. ap. - apDisableIntraBssFwd); + disable_intrabss_fwd); if (!QDF_IS_STATUS_SUCCESS(qdf_ret_status)) ret = -EINVAL; } diff --git a/core/hdd/src/wlan_hdd_ipa.c b/core/hdd/src/wlan_hdd_ipa.c index 3da984baa849..99f4e9ffedcb 100644 --- a/core/hdd/src/wlan_hdd_ipa.c +++ b/core/hdd/src/wlan_hdd_ipa.c @@ -4337,7 +4337,7 @@ static void __hdd_ipa_w2i_cb(void *priv, enum ipa_dp_evt_type evt, /* Disable to forward Intra-BSS Rx packets when * ap_isolate=1 in hostapd.conf */ - if (!adapter->sessionCtx.ap.apDisableIntraBssFwd) { + if (!adapter->sessionCtx.ap.disable_intrabss_fwd) { /* * When INTRA_BSS_FWD_OFFLOAD is enabled, FW will send * all Rx packets to IPA uC, which need to be forwarded