diff options
| author | Jeff Johnson <jjohnson@qca.qualcomm.com> | 2014-08-13 12:05:44 -0700 |
|---|---|---|
| committer | Pitani Venkata Rajesh Kumar <c_vpitan@qti.qualcomm.com> | 2014-08-20 13:16:52 +0530 |
| commit | ad73e18cb30942fa7170d2aa1ea56dd1512e8068 (patch) | |
| tree | 217acc0bd7f65355a17efb1ccff96aa3af44764f | |
| parent | e2fa9973e0bfdbbf8da96eae052755ec7945170a (diff) | |
wlan: hdd: Remove additional obsolete ISOC & WIFI_2_0 conditions
Previously the change "wlan: hdd: Remove obsolete ISOC and WIFI_2_0
conditions" with Change-Id I5d11c5d7c4bb5d45ca98c491633a26d1be69e29a
removed conditional compilation based upon the QCA_WIFI_ISOC and
QCA_WIFI_2_0 flags. Subsequent analysis identified additional code
that was conditional upon another flag, CONFIG_QCA_WIFI_ISOC, so
remove that conditional code as well. In addition fixup a comment
that was missed in the first change.
Change-Id: I645da62a2efb74e9c868ed4d916c2753a0e4a887
CRs-fixed: 709179
| -rw-r--r-- | CORE/HDD/inc/wlan_hdd_assoc.h | 4 | ||||
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_ftm.c | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/CORE/HDD/inc/wlan_hdd_assoc.h b/CORE/HDD/inc/wlan_hdd_assoc.h index 4abef31bffaa..ca3da64cf926 100644 --- a/CORE/HDD/inc/wlan_hdd_assoc.h +++ b/CORE/HDD/inc/wlan_hdd_assoc.h @@ -42,11 +42,7 @@ /* In pronto case, IBSS owns the first peer for bss peer. In Rome case, IBSS uses the 2nd peer as bss peer */ -#ifdef CONFIG_QCA_WIFI_ISOC -#define IBSS_BROADCAST_STAID 0 -#else #define IBSS_BROADCAST_STAID 1 -#endif typedef enum { diff --git a/CORE/HDD/src/wlan_hdd_ftm.c b/CORE/HDD/src/wlan_hdd_ftm.c index 45654de3cfee..c69dd28a1f43 100644 --- a/CORE/HDD/src/wlan_hdd_ftm.c +++ b/CORE/HDD/src/wlan_hdd_ftm.c @@ -310,7 +310,7 @@ static VOS_STATUS wlan_ftm_vos_open( v_CONTEXT_t pVosContext, v_SIZE_t hddContex "%s: Failed to complete BMI phase", __func__); goto err_htc_close; } -#endif /* QCA_WIFI_2_0 && QCA_WIFI_FTM */ +#endif /* QCA_WIFI_FTM */ /* Open the SYS module */ vStatus = sysOpen(gpVosContext); |