Skip to content
This repository has been archived by the owner on Sep 18, 2022. It is now read-only.

Commit

Permalink
driver: staging: prima: updated 3.2.3.172 (5b58dd7)
Browse files Browse the repository at this point in the history 
a99c61d wlan: Fix DHCP failure caused by PTK overwrite
e8f4749 wlan: Fix DXE stop during SSR
971c000 wlan: DroidSec: String handling and input validation issues
42e6262 wlan: Initilize country IE prefrence flag
7aa4885 Add the fix that was deleted in other change
1d378ac wlan: include wesmode support again
79f77aa wlan: Fix bssid in del_pmksa and flush_pmksa
edc3d14 Add Support for DELBA per session on Coex Indication
11fec72 wlan: ARGENTINA CountryCode should be 'AR' in csrApiScan.c
2197d6e WLAN: Fix memory leaks during get BSS Descriptor IE's
fae3a75 wlan: Add support to enable/disable MAWC
409b45b wlan: Add support to enable/disable MAWC in HAL message
24c5b95 wlan: Ignore broadcast mac address to get connected staId.

Change-Id: Ie7dcdc53e2f288185e60210abddb06210cd819dc
  • Loading branch information
Giulio Cervera committed Nov 29, 2013
1 parent 35bb1c3 commit dbbdd25
Show file tree
Hide file tree
Showing 29 changed files with 1,003 additions and 64 deletions.
1 change: 0 additions & 1 deletion drivers/staging/prima/CORE/DXE/src/wlan_qct_dxe.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4910,7 +4910,6 @@ wpt_status WLANDXE_Stop
{
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_ERROR,
"WLANDXE_Stop Channel %d Stop Fail", idx);
return status;
}
}

Expand Down
93 changes: 93 additions & 0 deletions drivers/staging/prima/CORE/HDD/inc/wlan_hdd_cfg.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -788,6 +788,11 @@ typedef enum
#define CFG_LFR_FEATURE_ENABLED_MIN (0)
#define CFG_LFR_FEATURE_ENABLED_MAX (1)
#define CFG_LFR_FEATURE_ENABLED_DEFAULT (0) //disabled

#define CFG_LFR_MAWC_FEATURE_ENABLED_NAME "MAWCEnabled"
#define CFG_LFR_MAWC_FEATURE_ENABLED_MIN (0)
#define CFG_LFR_MAWC_FEATURE_ENABLED_MAX (1)
#define CFG_LFR_MAWC_FEATURE_ENABLED_DEFAULT (0) /* disabled */
#endif // FEATURE_WLAN_LFR

#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_CCX) || defined(FEATURE_WLAN_LFR)
Expand Down Expand Up @@ -827,6 +832,12 @@ typedef enum
#define CFG_IMMEDIATE_ROAM_RSSI_DIFF_MAX (125)
#define CFG_IMMEDIATE_ROAM_RSSI_DIFF_DEFAULT (0)

/*This parameter is used to set Wireless Extended Security Mode.*/
#define CFG_ENABLE_WES_MODE_NAME "gWESModeEnabled"
#define CFG_ENABLE_WES_MODE_NAME_MIN (0)
#define CFG_ENABLE_WES_MODE_NAME_MAX (1)
#define CFG_ENABLE_WES_MODE_NAME_DEFAULT (0)

#define CFG_ROAM_SCAN_N_PROBES "gRoamScanNProbes"
#define CFG_ROAM_SCAN_N_PROBES_MIN (1)
#define CFG_ROAM_SCAN_N_PROBES_MAX (10)
Expand Down Expand Up @@ -1099,6 +1110,79 @@ typedef enum
#define CFG_BTC_DHCP_PROT_ON_SCO_MAX ( 1 )
#define CFG_BTC_DHCP_PROT_ON_SCO_DEFAULT ( 0 )

#define CFG_MWS_COEX_V1_WAN_FREQ_NAME "mwsCoexVictim1WANFreq"
#define CFG_MWS_COEX_VX_WAN_FREQ_MIN ( 0 )
#define CFG_MWS_COEX_VX_WAN_FREQ_MAX ( 0xFFFFFFFF )
#define CFG_MWS_COEX_VX_WAN_FREQ_DEFAULT ( 0 )

#define CFG_MWS_COEX_V1_WLAN_FREQ_NAME "mwsCoexVictim1WLANFreq"
#define CFG_MWS_COEX_VX_WLAN_FREQ_MIN ( 0 )
#define CFG_MWS_COEX_VX_WLAN_FREQ_MAX ( 0xFFFFFFFF )
#define CFG_MWS_COEX_VX_WLAN_FREQ_DEFAULT ( 0 )

#define CFG_MWS_COEX_V1_CONFIG_NAME "mwsCoexVictim1Config"
#define CFG_MWS_COEX_V1_CONFIG2_NAME "mwsCoexVictim1Config2"
#define CFG_MWS_COEX_VX_CONFIG_MIN ( 0 )
#define CFG_MWS_COEX_VX_CONFIG_MAX ( 0xFFFFFFFF )
#define CFG_MWS_COEX_VX_CONFIG_DEFAULT ( 0 )

#define CFG_MWS_COEX_V2_WAN_FREQ_NAME "mwsCoexVictim2WANFreq"
#define CFG_MWS_COEX_V2_WLAN_FREQ_NAME "mwsCoexVictim2WLANFreq"
#define CFG_MWS_COEX_V2_CONFIG_NAME "mwsCoexVictim2Config"
#define CFG_MWS_COEX_V2_CONFIG2_NAME "mwsCoexVictim2Config2"
#define CFG_MWS_COEX_V3_WAN_FREQ_NAME "mwsCoexVictim3WANFreq"
#define CFG_MWS_COEX_V3_WLAN_FREQ_NAME "mwsCoexVictim3WLANFreq"
#define CFG_MWS_COEX_V3_CONFIG_NAME "mwsCoexVictim3Config"
#define CFG_MWS_COEX_V3_CONFIG2_NAME "mwsCoexVictim3Config2"
#define CFG_MWS_COEX_V4_WAN_FREQ_NAME "mwsCoexVictim4WANFreq"
#define CFG_MWS_COEX_V4_WLAN_FREQ_NAME "mwsCoexVictim4WLANFreq"
#define CFG_MWS_COEX_V4_CONFIG_NAME "mwsCoexVictim4Config"
#define CFG_MWS_COEX_V4_CONFIG2_NAME "mwsCoexVictim4Config2"
#define CFG_MWS_COEX_V5_WAN_FREQ_NAME "mwsCoexVictim5WANFreq"
#define CFG_MWS_COEX_V5_WLAN_FREQ_NAME "mwsCoexVictim5WLANFreq"
#define CFG_MWS_COEX_V5_CONFIG_NAME "mwsCoexVictim5Config"
#define CFG_MWS_COEX_V5_CONFIG2_NAME "mwsCoexVictim5Config2"
#define CFG_MWS_COEX_V6_WAN_FREQ_NAME "mwsCoexVictim6WANFreq"
#define CFG_MWS_COEX_V6_WLAN_FREQ_NAME "mwsCoexVictim6WLANFreq"
#define CFG_MWS_COEX_V6_CONFIG_NAME "mwsCoexVictim6Config"
#define CFG_MWS_COEX_V6_CONFIG2_NAME "mwsCoexVictim6Config2"
#define CFG_MWS_COEX_V7_WAN_FREQ_NAME "mwsCoexVictim7WANFreq"
#define CFG_MWS_COEX_V7_WLAN_FREQ_NAME "mwsCoexVictim7WLANFreq"
#define CFG_MWS_COEX_V7_CONFIG_NAME "mwsCoexVictim7Config"
#define CFG_MWS_COEX_V7_CONFIG2_NAME "mwsCoexVictim7Config2"
#define CFG_MWS_COEX_V8_WAN_FREQ_NAME "mwsCoexVictim8WANFreq"
#define CFG_MWS_COEX_V8_WLAN_FREQ_NAME "mwsCoexVictim8WLANFreq"
#define CFG_MWS_COEX_V8_CONFIG_NAME "mwsCoexVictim8Config"
#define CFG_MWS_COEX_V8_CONFIG2_NAME "mwsCoexVictim8Config2"
#define CFG_MWS_COEX_V9_WAN_FREQ_NAME "mwsCoexVictim9WANFreq"
#define CFG_MWS_COEX_V9_WLAN_FREQ_NAME "mwsCoexVictim9WLANFreq"
#define CFG_MWS_COEX_V9_CONFIG_NAME "mwsCoexVictim9Config"
#define CFG_MWS_COEX_V9_CONFIG2_NAME "mwsCoexVictim9Config2"
#define CFG_MWS_COEX_V10_WAN_FREQ_NAME "mwsCoexVictim10WANFreq"
#define CFG_MWS_COEX_V10_WLAN_FREQ_NAME "mwsCoexVictim10WLANFreq"
#define CFG_MWS_COEX_V10_CONFIG_NAME "mwsCoexVictim10Config"
#define CFG_MWS_COEX_V10_CONFIG2_NAME "mwsCoexVictim10Config2"

#define CFG_MWS_COEX_MODEM_BACKOFF_NAME "mwsCoexModemBackoff"
#define CFG_MWS_COEX_MODEM_BACKOFF_MIN ( 0 )
#define CFG_MWS_COEX_MODEM_BACKOFF_MAX ( 0xFFFFFFFF )
#define CFG_MWS_COEX_MODEM_BACKOFF_DEFAULT ( 0 )

#define CFG_MWS_COEX_CONFIG1_NAME "mwsCoexConfig1"
#define CFG_MWS_COEX_CONFIGX_MIN ( 0 )
#define CFG_MWS_COEX_CONFIGX_MAX ( 0xFFFFFFFF )
#define CFG_MWS_COEX_CONFIGX_DEFAULT ( 0 )
#define CFG_MWS_COEX_CONFIG2_NAME "mwsCoexConfig2"
#define CFG_MWS_COEX_CONFIG3_NAME "mwsCoexConfig3"
#define CFG_MWS_COEX_CONFIG4_NAME "mwsCoexConfig4"
#define CFG_MWS_COEX_CONFIG5_NAME "mwsCoexConfig5"
#define CFG_MWS_COEX_CONFIG6_NAME "mwsCoexConfig6"

#define CFG_SAR_POWER_BACKOFF_NAME "SARPowerBackoff"
#define CFG_SAR_POWER_BACKOFF_MIN ( 0 )
#define CFG_SAR_POWER_BACKOFF_MAX ( 0xFFFFFFFF )
#define CFG_SAR_POWER_BACKOFF_DEFAULT ( 0 )

#if defined WLAN_FEATURE_VOWIFI_11R
#define CFG_FT_RESOURCE_REQ_NAME "gFTResourceReqSupported"
#define CFG_FT_RESOURCE_REQ_MIN (0)
Expand Down Expand Up @@ -1897,6 +1981,13 @@ typedef struct
v_U32_t btcMaxScoBlockPerc;
v_U32_t btcDhcpProtOnA2dp;
v_U32_t btcDhcpProtOnSco;
v_U32_t mwsCoexVictimWANFreq[10];
v_U32_t mwsCoexVictimWLANFreq[10];
v_U32_t mwsCoexVictimConfig[10];
v_U32_t mwsCoexVictimConfig2[10];
v_U32_t mwsCoexModemBackoff;
v_U32_t mwsCoexConfig[6];
v_U32_t SARPowerBackoff;
v_U32_t nImpsModSleepTime;
v_U32_t nImpsMaxSleepTime;
v_U32_t nImpsMinSleepTime;
Expand Down Expand Up @@ -2029,6 +2120,7 @@ typedef struct
v_U32_t InfraUapsdBkSuspIntv;
#ifdef FEATURE_WLAN_LFR
v_BOOL_t isFastRoamIniFeatureEnabled;
v_BOOL_t MAWCEnabled;
#endif
#ifdef FEATURE_WLAN_CCX
v_U32_t InfraInactivityInterval;
Expand All @@ -2038,6 +2130,7 @@ typedef struct
v_BOOL_t isFastTransitionEnabled;
v_U8_t RoamRssiDiff;
v_U8_t nImmediateRoamRssiDiff;
v_BOOL_t isWESModeEnabled;
#endif
#ifdef FEATURE_WLAN_OKC
v_BOOL_t isOkcIniFeatureEnabled;
Expand Down
1 change: 1 addition & 0 deletions drivers/staging/prima/CORE/HDD/inc/wlan_hdd_main.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1166,6 +1166,7 @@ void hdd_set_pwrparams(hdd_context_t *pHddCtx);
void hdd_reset_pwrparams(hdd_context_t *pHddCtx);
int wlan_hdd_validate_context(hdd_context_t *pHddCtx);
VOS_STATUS hdd_issta_p2p_clientconnected(hdd_context_t *pHddCtx);
v_BOOL_t hdd_is_valid_mac_address(const tANI_U8* pMacAddr);
#ifdef WLAN_FEATURE_PACKET_FILTERING
int wlan_hdd_setIPv6Filter(hdd_context_t *pHddCtx, tANI_U8 filterType, tANI_U8 sessionId);
#endif
Expand Down
Loading

0 comments on commit dbbdd25

Please sign in to comment.