summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSelvaraj, Sridhar <sselvara@codeaurora.org>2016-06-25 17:01:52 +0530
committerqcabuildsw <qcabuildsw@localhost>2016-08-17 17:06:55 -0700
commit35cc2cf07c552f9abbec47be8657d52cf92cae0b (patch)
treeaa6a0cadfc102c8dd9476c17c3567d901c28a3a6
parent7f171abb04a0823994107a380c7ea62b610caa3e (diff)
qcacld-3.0: Don't populate TDLS IE's in extended capabilities
qcacld-2.0 to qcacld-3.0 propagation Currently in case of IBSS, beacons are populated with TDLS IE's in extended capabilities though TDLS IE's and extended capabilities doesn't signify anything. Fix will ensure to exclude extended capabilities and TDLS IE's Git-commit: c50b50f7f0616b4536e7df998e98f9347562e680 Change-Id: I63b6f413964cc53f2f25496fef40f99c4244293a CRs-Fixed: 1017887
-rw-r--r--core/mac/src/pe/sch/sch_beacon_gen.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/core/mac/src/pe/sch/sch_beacon_gen.c b/core/mac/src/pe/sch/sch_beacon_gen.c
index 3acbb7d18027..415bdaf358ee 100644
--- a/core/mac/src/pe/sch/sch_beacon_gen.c
+++ b/core/mac/src/pe/sch/sch_beacon_gen.c
@@ -395,8 +395,9 @@ sch_set_fixed_beacon_fields(tpAniSirGlobal mac_ctx, tpPESession session)
populate_dot11f_operating_mode(mac_ctx,
&bcn_2->OperatingMode, session);
}
- populate_dot11f_ext_cap(mac_ctx, is_vht_enabled, &bcn_2->ExtCap,
- session);
+ if (session->limSystemRole != eLIM_STA_IN_IBSS_ROLE)
+ populate_dot11f_ext_cap(mac_ctx, is_vht_enabled, &bcn_2->ExtCap,
+ session);
populate_dot11f_ext_supp_rates(mac_ctx,
POPULATE_DOT11F_RATES_OPERATIONAL,
&bcn_2->ExtSuppRates, session);
@@ -498,7 +499,8 @@ sch_set_fixed_beacon_fields(tpAniSirGlobal mac_ctx, tpPESession session)
sch_log(mac_ctx, LOG1, FL("extcap not extracted"));
}
/* merge extcap IE */
- if (extcap_present)
+ if (extcap_present &&
+ session->limSystemRole != eLIM_STA_IN_IBSS_ROLE)
lim_merge_extcap_struct(&bcn_2->ExtCap,
&extracted_extcap);