Merge "wlan: Protect ROC ctx with mutex during ROC Ready."
diff --git a/CORE/HDD/inc/wlan_hdd_cfg.h b/CORE/HDD/inc/wlan_hdd_cfg.h
index 34845b9..87f3633 100644
--- a/CORE/HDD/inc/wlan_hdd_cfg.h
+++ b/CORE/HDD/inc/wlan_hdd_cfg.h
@@ -1519,6 +1519,13 @@
#define CFG_OBSS_HT40_SCAN_WIDTH_TRIGGER_INTERVAL_MAX ( 900 )
#define CFG_OBSS_HT40_SCAN_WIDTH_TRIGGER_INTERVAL_DEFAULT ( 200 )
+/* RPS configurations */
+#define CFG_RPS_CPU_MAP_MIN (0)
+#define CFG_RPS_CPU_MAP_MAX (0xff)
+
+#define CFG_RPS_CPU_MAP_NAME "rps_mask"
+#define CFG_RPS_CPU_MAP_DEFAULT (0x00)
+
#define CFG_MULTICAST_HOST_FW_MSGS "gMulticastHostMsgs"
#define CFG_MULTICAST_HOST_FW_MSGS_MIN (0)
#define CFG_MULTICAST_HOST_FW_MSGS_MAX (1)
@@ -1542,6 +1549,16 @@
#define CFG_DEFAULT_RATE_INDEX_24GH_MAX ( 7 )
#define CFG_DEFAULT_RATE_INDEX_24GH_DEFAULT ( 1 )
+
+/*
+ * This INI item is used to control subsystem restart(SSR) test framework
+ * Set its value to 1 to enable APPS trigerred SSR testing
+ */
+#define CFG_ENABLE_CRASH_INJECT "gEnableForceTargetAssert"
+#define CFG_ENABLE_CRASH_INJECT_MIN (0)
+#define CFG_ENABLE_CRASH_INJECT_MAX (1)
+#define CFG_ENABLE_CRASH_INJECT_DEFAULT (0)
+
static __inline tANI_U32 defHddRateToDefCfgRate( tANI_U32 defRateIndex )
{
switch(defRateIndex){
@@ -3046,6 +3063,8 @@
v_U32_t linkFailTxCnt;
v_BOOL_t ignorePeerHTopMode;
v_U8_t gOptimizeCAevent;
+ v_BOOL_t crash_inject_enabled;
+ v_U16_t rps_mask;
} hdd_config_t;
/*---------------------------------------------------------------------------
diff --git a/CORE/HDD/inc/wlan_hdd_cfg80211.h b/CORE/HDD/inc/wlan_hdd_cfg80211.h
index c9f2bb2..e0d03c8 100644
--- a/CORE/HDD/inc/wlan_hdd_cfg80211.h
+++ b/CORE/HDD/inc/wlan_hdd_cfg80211.h
@@ -1008,6 +1008,13 @@
void* wlan_hdd_change_country_code_cb(void *pAdapter);
void hdd_select_cbmode( hdd_adapter_t *pAdapter,v_U8_t operationChannel);
+v_U8_t* wlan_hdd_cfg80211_get_ie_ptr(
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0))
+ const v_U8_t *pIes,
+#else
+ v_U8_t *pIes,
+#endif
+ int length, v_U8_t eid);
#ifdef FEATURE_WLAN_CH_AVOID
int wlan_hdd_send_avoid_freq_event(hdd_context_t *pHddCtx,
@@ -1021,4 +1028,18 @@
void wlan_hdd_cfg80211_nan_init(hdd_context_t *pHddCtx);
+#if !(defined (SUPPORT_WDEV_CFG80211_VENDOR_EVENT_ALLOC))
+static inline struct sk_buff *
+backported_cfg80211_vendor_event_alloc(struct wiphy *wiphy,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0))
+ struct wireless_dev *wdev,
+#endif
+ int approxlen,
+ int event_idx, gfp_t gfp)
+{
+ return cfg80211_vendor_event_alloc(wiphy, approxlen, event_idx, gfp);
+}
+#define cfg80211_vendor_event_alloc backported_cfg80211_vendor_event_alloc
+#endif
+
#endif
diff --git a/CORE/HDD/inc/wlan_hdd_main.h b/CORE/HDD/inc/wlan_hdd_main.h
index 982f69f..3a7a9da 100644
--- a/CORE/HDD/inc/wlan_hdd_main.h
+++ b/CORE/HDD/inc/wlan_hdd_main.h
@@ -1703,6 +1703,7 @@
int hdd_enable_disable_ca_event(hdd_context_t *pHddCtx,
tANI_U8* command, tANI_U8 cmd_len);
+void hdd_indicate_mgmt_frame(tSirSmeMgmtFrameInd *frame_ind);
#ifdef WLAN_FEATURE_LINK_LAYER_STATS
/**
@@ -1724,5 +1725,5 @@
return;
}
#endif /* WLAN_FEATURE_LINK_LAYER_STATS */
-
+void hdd_wlan_free_wiphy_channels(struct wiphy *wiphy);
#endif // end #if !defined( WLAN_HDD_MAIN_H )
diff --git a/CORE/HDD/inc/wlan_hdd_p2p.h b/CORE/HDD/inc/wlan_hdd_p2p.h
index b21ade7..4e733f0 100644
--- a/CORE/HDD/inc/wlan_hdd_p2p.h
+++ b/CORE/HDD/inc/wlan_hdd_p2p.h
@@ -129,17 +129,19 @@
int hdd_setP2pOpps( struct net_device *dev, tANI_U8 *command );
int hdd_setP2pNoa( struct net_device *dev, tANI_U8 *command );
-void hdd_indicateMgmtFrame( hdd_adapter_t *pAdapter,
+void __hdd_indicate_mgmt_frame(hdd_adapter_t *pAdapter,
tANI_U32 nFrameLength, tANI_U8* pbFrames,
tANI_U8 frameType,
tANI_U32 rxChan, tANI_S8 rxRssi);
-
void hdd_remainChanReadyHandler( hdd_adapter_t *pAdapter );
void hdd_sendActionCnf( hdd_adapter_t *pAdapter, tANI_BOOLEAN actionSendSuccess );
int wlan_hdd_check_remain_on_channel(hdd_adapter_t *pAdapter);
VOS_STATUS wlan_hdd_cancel_existing_remain_on_channel(hdd_adapter_t *pAdapter);
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0))
+int wlan_hdd_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,
+ struct cfg80211_mgmt_tx_params *params, u64 *cookie);
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0))
int wlan_hdd_mgmt_tx( struct wiphy *wiphy, struct wireless_dev *wdev,
struct ieee80211_channel *chan, bool offchan,
#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0))
diff --git a/CORE/HDD/inc/wlan_hdd_tdls.h b/CORE/HDD/inc/wlan_hdd_tdls.h
index 75a5dc1..35b9091 100644
--- a/CORE/HDD/inc/wlan_hdd_tdls.h
+++ b/CORE/HDD/inc/wlan_hdd_tdls.h
@@ -149,7 +149,12 @@
WIFI_TDLS_FAILED /* Direct link failed */
} tdls_state_t;
-typedef int (*cfg80211_exttdls_callback)(tANI_U8* mac,
+typedef int (*cfg80211_exttdls_callback)(
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0))
+ const tANI_U8* mac,
+#else
+ tANI_U8* mac,
+#endif
tANI_S32 state,
tANI_S32 reason,
void *ctx);
@@ -247,13 +252,25 @@
int wlan_hdd_tdls_set_sta_id(hdd_adapter_t *pAdapter, u8 *mac, u8 staId);
-hddTdlsPeer_t *wlan_hdd_tdls_find_peer(hdd_adapter_t *pAdapter, u8 *mac, tANI_BOOLEAN mutexLock);
+hddTdlsPeer_t *wlan_hdd_tdls_find_peer(hdd_adapter_t *pAdapter,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0))
+ const u8 *mac,
+#else
+ u8 *mac,
+#endif
+ tANI_BOOLEAN mutexLock);
hddTdlsPeer_t *wlan_hdd_tdls_find_all_peer(hdd_context_t *pHddCtx, u8 *mac);
int wlan_hdd_tdls_get_link_establish_params(hdd_adapter_t *pAdapter, u8 *mac,
tCsrTdlsLinkEstablishParams* tdlsLinkEstablishParams);
-hddTdlsPeer_t *wlan_hdd_tdls_get_peer(hdd_adapter_t *pAdapter, u8 *mac);
+hddTdlsPeer_t *wlan_hdd_tdls_get_peer(hdd_adapter_t *pAdapter,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0))
+ const u8 *mac
+#else
+ u8 *mac
+#endif
+ );
int wlan_hdd_tdls_set_cap(hdd_adapter_t *pAdapter, u8* mac, tTDLSCapType cap);
@@ -261,14 +278,22 @@
tTDLSLinkStatus status,
tTDLSLinkReason reason);
void wlan_hdd_tdls_set_link_status(hdd_adapter_t *pAdapter,
- u8* mac,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0))
+ const u8 *mac,
+#else
+ u8 *mac,
+#endif
tTDLSLinkStatus linkStatus,
tTDLSLinkReason reason);
int wlan_hdd_tdls_recv_discovery_resp(hdd_adapter_t *pAdapter, u8 *mac);
int wlan_hdd_tdls_set_peer_caps(hdd_adapter_t *pAdapter,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0))
+ const u8 *mac,
+#else
u8 *mac,
+#endif
tCsrStaParams *StaParams,
tANI_BOOLEAN isBufSta,
tANI_BOOLEAN isOffChannelSupported);
@@ -303,7 +328,12 @@
u8 wlan_hdd_tdls_is_peer_progress(hdd_adapter_t *pAdapter, u8 *mac);
-hddTdlsPeer_t *wlan_hdd_tdls_is_progress(hdd_context_t *pHddCtx, u8* mac,
+hddTdlsPeer_t *wlan_hdd_tdls_is_progress(hdd_context_t *pHddCtx,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0))
+ const u8 *mac,
+#else
+ u8 *mac,
+#endif
u8 skip_self, tANI_BOOLEAN mutexLock);
void wlan_hdd_tdls_set_mode(hdd_context_t *pHddCtx,
diff --git a/CORE/HDD/inc/wlan_hdd_wmm.h b/CORE/HDD/inc/wlan_hdd_wmm.h
index bc32a1d..76c2837 100644
--- a/CORE/HDD/inc/wlan_hdd_wmm.h
+++ b/CORE/HDD/inc/wlan_hdd_wmm.h
@@ -264,8 +264,14 @@
@return : Qdisc queue index
===========================================================================*/
-v_U16_t hdd_hostapd_select_queue(struct net_device * dev, struct sk_buff *skb);
-
+v_U16_t hdd_hostapd_select_queue(struct net_device * dev, struct sk_buff *skb
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,13,0))
+ , void *accel_priv
+#endif
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0))
+ , select_queue_fallback_t fallbac
+#endif
+);
/**============================================================================
diff --git a/CORE/HDD/src/wlan_hdd_assoc.c b/CORE/HDD/src/wlan_hdd_assoc.c
index dd5bbc5..cea0050 100644
--- a/CORE/HDD/src/wlan_hdd_assoc.c
+++ b/CORE/HDD/src/wlan_hdd_assoc.c
@@ -2114,6 +2114,11 @@
if (pRoamInfo->pBssDesc)
{
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,15,0))
+ struct ieee80211_channel *chan;
+ int chan_no;
+ unsigned int freq;
+#endif
hdd_ibss_RegisterSTA (pAdapter, pRoamInfo,
IBSS_BROADCAST_STAID,
&broadcastMacAddr, pRoamInfo->pBssDesc);
@@ -2133,8 +2138,28 @@
__func__, pAdapter->dev->name);
return;
}
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,15,0))
+ chan_no = pRoamInfo->pBssDesc->channelId;
+ if (chan_no <= 14)
+ freq = ieee80211_channel_to_frequency(chan_no,
+ IEEE80211_BAND_2GHZ);
+ else
+ freq = ieee80211_channel_to_frequency(chan_no,
+ IEEE80211_BAND_5GHZ);
+
+ chan = ieee80211_get_channel(pAdapter->wdev.wiphy, freq);
+
+ if (chan)
+ cfg80211_ibss_joined(pAdapter->dev, bss->bssid,
+ chan, GFP_KERNEL);
+ else
+ hddLog(LOGE, FL("%s: chanId: %d, can't find channel"),
+ pAdapter->dev->name,
+ (int)pRoamInfo->pBssDesc->channelId);
+#else
cfg80211_ibss_joined(pAdapter->dev, bss->bssid, GFP_KERNEL);
+#endif
cfg80211_put_bss(
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0))
pHddCtx->wiphy,
@@ -3352,7 +3377,6 @@
hdd_context_t* pHddCtx = (hdd_context_t*)pAdapter->pHddCtx;
if((pHddCtx) &&
- (VOS_TRUE == pHddStaCtx->hdd_ReassocScenario) &&
(TRUE == pHddCtx->hdd_wlan_suspended) &&
(eCSR_ROAM_RESULT_NONE == roamResult))
{
@@ -3450,15 +3474,6 @@
}
break;
#endif
-
- case eCSR_ROAM_INDICATE_MGMT_FRAME:
- hdd_indicateMgmtFrame( pAdapter,
- pRoamInfo->nFrameLength,
- pRoamInfo->pbFrames,
- pRoamInfo->frameType,
- pRoamInfo->rxChan,
- pRoamInfo->rxRssi );
- break;
case eCSR_ROAM_REMAIN_CHAN_READY:
hdd_remainChanReadyHandler( pAdapter );
break;
@@ -4962,12 +4977,20 @@
/* Get pAdapter from Destination mac address of the frame */
if (type == SIR_MAC_MGMT_FRAME && subType == SIR_MAC_MGMT_DISASSOC)
{
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0))
+ cfg80211_rx_unprot_mlme_mgmt(pAdapter->dev, pbFrames, nFrameLength);
+#else
cfg80211_send_unprot_disassoc(pAdapter->dev, pbFrames, nFrameLength);
+#endif
pAdapter->hdd_stats.hddPmfStats.numUnprotDisassocRx++;
}
else if (type == SIR_MAC_MGMT_FRAME && subType == SIR_MAC_MGMT_DEAUTH)
{
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0))
+ cfg80211_rx_unprot_mlme_mgmt(pAdapter->dev, pbFrames, nFrameLength);
+#else
cfg80211_send_unprot_deauth(pAdapter->dev, pbFrames, nFrameLength);
+#endif
pAdapter->hdd_stats.hddPmfStats.numUnprotDeauthRx++;
}
else
diff --git a/CORE/HDD/src/wlan_hdd_cfg.c b/CORE/HDD/src/wlan_hdd_cfg.c
index b775c61..5ba7ffc 100644
--- a/CORE/HDD/src/wlan_hdd_cfg.c
+++ b/CORE/HDD/src/wlan_hdd_cfg.c
@@ -3395,7 +3395,19 @@
CFG_OPTIMIZE_CA_EVENT_DEFAULT,
CFG_OPTIMIZE_CA_EVENT_DISABLE,
CFG_OPTIMIZE_CA_EVENT_ENABLE ),
+ REG_VARIABLE( CFG_ENABLE_CRASH_INJECT, WLAN_PARAM_Integer,
+ hdd_config_t, crash_inject_enabled,
+ VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+ CFG_ENABLE_CRASH_INJECT_DEFAULT,
+ CFG_ENABLE_CRASH_INJECT_MIN,
+ CFG_ENABLE_CRASH_INJECT_MAX),
+ REG_VARIABLE( CFG_RPS_CPU_MAP_NAME, WLAN_PARAM_HexInteger,
+ hdd_config_t, rps_mask,
+ VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+ CFG_RPS_CPU_MAP_DEFAULT,
+ CFG_RPS_CPU_MAP_MIN,
+ CFG_RPS_CPU_MAP_MAX),
};
/*
@@ -3819,6 +3831,7 @@
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [gDxeReplenishRXTimerVal] Value = [%u] ", pHddCtx->cfg_ini->dxeReplenishRXTimerVal);
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [gDxeSSREnable] Value = [%u] ", pHddCtx->cfg_ini->dxeSSREnable);
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [toggleArpBDRates] Value = [%u] ", pHddCtx->cfg_ini->toggleArpBDRates);
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [gEnableForceTargetAssert] Value = [%u] ", pHddCtx->cfg_ini->crash_inject_enabled);
}
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index 9a39089..6b6eca1 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -204,7 +204,7 @@
(addr[3] == 0xff) && (addr[4] == 0xff) && (addr[5] == 0xff));
}
-static struct ieee80211_channel hdd_channels_2_4_GHZ[] =
+const static struct ieee80211_channel hdd_channels_2_4_GHZ[] =
{
HDD2GHZCHAN(2412, 1, 0) ,
HDD2GHZCHAN(2417, 2, 0) ,
@@ -229,7 +229,7 @@
HDD2GHZCHAN(2462, 11, 0) ,
};
-static struct ieee80211_channel hdd_channels_5_GHZ[] =
+const static struct ieee80211_channel hdd_channels_5_GHZ[] =
{
HDD5GHZCHAN(4920, 240, 0) ,
HDD5GHZCHAN(4940, 244, 0) ,
@@ -297,7 +297,7 @@
static struct ieee80211_supported_band wlan_hdd_band_2_4_GHZ =
{
- .channels = hdd_channels_2_4_GHZ,
+ .channels = NULL,
.n_channels = ARRAY_SIZE(hdd_channels_2_4_GHZ),
.band = IEEE80211_BAND_2GHZ,
.bitrates = g_mode_rates,
@@ -335,7 +335,7 @@
static struct ieee80211_supported_band wlan_hdd_band_5_GHZ =
{
- .channels = hdd_channels_5_GHZ,
+ .channels = NULL,
.n_channels = ARRAY_SIZE(hdd_channels_5_GHZ),
.band = IEEE80211_BAND_5GHZ,
.bitrates = a_mode_rates,
@@ -627,6 +627,9 @@
}
vendor_event = cfg80211_vendor_event_alloc(pHddCtx->wiphy,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0))
+ NULL,
+#endif
sizeof(tHddAvoidFreqList),
QCA_NL80211_VENDOR_SUBCMD_AVOID_FREQUENCY_INDEX,
GFP_KERNEL);
@@ -758,6 +761,9 @@
}
vendor_event = cfg80211_vendor_event_alloc(pHddCtx->wiphy,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0))
+ NULL,
+#endif
data->event_data_len +
NLMSG_HDRLEN,
QCA_NL80211_VENDOR_SUBCMD_NAN_INDEX,
@@ -2192,6 +2198,9 @@
return;
}
skb = cfg80211_vendor_event_alloc(pHddCtx->wiphy,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0))
+ NULL,
+#endif
EXTSCAN_EVENT_BUF_SIZE + NLMSG_HDRLEN,
QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_GET_CAPABILITIES_INDEX,
GFP_KERNEL);
@@ -2276,6 +2285,9 @@
}
skb = cfg80211_vendor_event_alloc(pHddCtx->wiphy,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0))
+ NULL,
+#endif
EXTSCAN_EVENT_BUF_SIZE + NLMSG_HDRLEN,
QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_START_INDEX,
GFP_KERNEL);
@@ -2338,6 +2350,9 @@
}
skb = cfg80211_vendor_event_alloc(pHddCtx->wiphy,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0))
+ NULL,
+#endif
EXTSCAN_EVENT_BUF_SIZE + NLMSG_HDRLEN,
QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_STOP_INDEX,
GFP_KERNEL);
@@ -2387,6 +2402,9 @@
}
skb = cfg80211_vendor_event_alloc(pHddCtx->wiphy,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0))
+ NULL,
+#endif
EXTSCAN_EVENT_BUF_SIZE + NLMSG_HDRLEN,
QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_SET_BSSID_HOTLIST_INDEX,
GFP_KERNEL);
@@ -2436,6 +2454,9 @@
}
skb = cfg80211_vendor_event_alloc(pHddCtx->wiphy,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0))
+ NULL,
+#endif
EXTSCAN_EVENT_BUF_SIZE + NLMSG_HDRLEN,
QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_RESET_BSSID_HOTLIST_INDEX,
GFP_KERNEL);
@@ -2485,6 +2506,9 @@
}
skb = cfg80211_vendor_event_alloc(pHddCtx->wiphy,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0))
+ NULL,
+#endif
EXTSCAN_EVENT_BUF_SIZE + NLMSG_HDRLEN,
QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_SET_SIGNIFICANT_CHANGE_INDEX,
GFP_KERNEL);
@@ -2535,6 +2559,9 @@
}
skb = cfg80211_vendor_event_alloc(pHddCtx->wiphy,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0))
+ NULL,
+#endif
EXTSCAN_EVENT_BUF_SIZE + NLMSG_HDRLEN,
QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_RESET_SIGNIFICANT_CHANGE_INDEX,
GFP_KERNEL);
@@ -2596,6 +2623,9 @@
totalResults -= EXTSCAN_MAX_CACHED_RESULTS_PER_IND;
skb = cfg80211_vendor_event_alloc(pHddCtx->wiphy,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0))
+ NULL,
+#endif
EXTSCAN_EVENT_BUF_SIZE + NLMSG_HDRLEN,
QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_GET_CACHED_RESULTS_INDEX,
GFP_KERNEL);
@@ -2750,6 +2780,9 @@
}
skb = cfg80211_vendor_event_alloc(pHddCtx->wiphy,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0))
+ NULL,
+#endif
EXTSCAN_EVENT_BUF_SIZE + NLMSG_HDRLEN,
QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_HOTLIST_AP_FOUND_INDEX,
GFP_KERNEL);
@@ -2870,6 +2903,9 @@
}
skb = cfg80211_vendor_event_alloc(pHddCtx->wiphy,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0))
+ NULL,
+#endif
EXTSCAN_EVENT_BUF_SIZE,
QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_SIGNIFICANT_CHANGE_INDEX,
GFP_KERNEL);
@@ -2973,6 +3009,9 @@
}
skb = cfg80211_vendor_event_alloc(pHddCtx->wiphy,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0))
+ NULL,
+#endif
EXTSCAN_EVENT_BUF_SIZE + NLMSG_HDRLEN,
QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_FULL_SCAN_RESULT_INDEX,
GFP_KERNEL);
@@ -3072,6 +3111,9 @@
}
skb = cfg80211_vendor_event_alloc(pHddCtx->wiphy,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0))
+ NULL,
+#endif
EXTSCAN_EVENT_BUF_SIZE + NLMSG_HDRLEN,
QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_SCAN_RESULTS_AVAILABLE_INDEX,
GFP_KERNEL);
@@ -3123,6 +3165,9 @@
}
skb = cfg80211_vendor_event_alloc(pHddCtx->wiphy,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0))
+ NULL,
+#endif
EXTSCAN_EVENT_BUF_SIZE + NLMSG_HDRLEN,
QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_SCAN_EVENT_INDEX,
GFP_KERNEL);
@@ -4527,7 +4572,12 @@
return ret;
}
-static int wlan_hdd_cfg80211_exttdls_callback(tANI_U8* mac,
+static int wlan_hdd_cfg80211_exttdls_callback(
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0))
+ const tANI_U8* mac,
+#else
+ tANI_U8* mac,
+#endif
tANI_S32 state,
tANI_S32 reason,
void *ctx)
@@ -4555,8 +4605,10 @@
hddLog(VOS_TRACE_LEVEL_ERROR, FL("TDLS external control is disabled"));
return -ENOTSUPP;
}
- skb = cfg80211_vendor_event_alloc(
- pHddCtx->wiphy,
+ skb = cfg80211_vendor_event_alloc(pHddCtx->wiphy,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0))
+ NULL,
+#endif
EXTTDLS_EVENT_BUF_SIZE + NLMSG_HDRLEN,
QCA_NL80211_VENDOR_SUBCMD_TDLS_STATE_CHANGE_INDEX,
GFP_KERNEL);
@@ -5652,8 +5704,11 @@
/* This will disable updating of NL channels from passive to
* active if a beacon is received on passive channel. */
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0))
+ wiphy->regulatory_flags |= REGULATORY_DISABLE_BEACON_HINTS;
+#else
wiphy->flags |= WIPHY_FLAG_DISABLE_BEACON_HINTS;
-
+#endif
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0))
@@ -5661,7 +5716,11 @@
| WIPHY_FLAG_AP_PROBE_RESP_OFFLOAD
| WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL
| WIPHY_FLAG_OFFCHAN_TX;
- wiphy->country_ie_pref = NL80211_COUNTRY_IE_IGNORE_CORE;
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0))
+ wiphy->regulatory_flags = REGULATORY_COUNTRY_IE_IGNORE;
+#else
+ wiphy->country_ie_pref = NL80211_COUNTRY_IE_IGNORE_CORE;
+#endif
#endif
#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR)
@@ -5760,12 +5819,44 @@
{
wlan_hdd_band_5_GHZ.ht_cap.cap &= ~IEEE80211_HT_CAP_SUP_WIDTH_20_40;
}
+ /*
+ * In case of static linked driver at the time of driver unload,
+ * module exit doesn't happens. Module cleanup helps in cleaning
+ * of static memory.
+ * If driver load happens statically, at the time of driver unload,
+ * wiphy flags don't get reset because of static memory.
+ * It's better not to store channel in static memory.
+ */
+ wiphy->bands[IEEE80211_BAND_2GHZ] = &wlan_hdd_band_2_4_GHZ;
+ wiphy->bands[IEEE80211_BAND_2GHZ]->channels =
+ (struct ieee80211_channel *)vos_mem_malloc(sizeof(hdd_channels_2_4_GHZ));
+ if (wiphy->bands[IEEE80211_BAND_2GHZ]->channels == NULL)
+ {
+ hddLog(VOS_TRACE_LEVEL_ERROR,
+ FL("Not enough memory to allocate channels"));
+ return -ENOMEM;
+ }
+ vos_mem_copy(wiphy->bands[IEEE80211_BAND_2GHZ]->channels,
+ &hdd_channels_2_4_GHZ[0],
+ sizeof(hdd_channels_2_4_GHZ));
- wiphy->bands[IEEE80211_BAND_2GHZ] = &wlan_hdd_band_2_4_GHZ;
- if (true == hdd_is_5g_supported(pHddCtx))
- {
- wiphy->bands[IEEE80211_BAND_5GHZ] = &wlan_hdd_band_5_GHZ;
- }
+ if (true == hdd_is_5g_supported(pHddCtx))
+ {
+ wiphy->bands[IEEE80211_BAND_5GHZ] = &wlan_hdd_band_5_GHZ;
+ wiphy->bands[IEEE80211_BAND_5GHZ]->channels =
+ (struct ieee80211_channel *)vos_mem_malloc(sizeof(hdd_channels_5_GHZ));
+ if (wiphy->bands[IEEE80211_BAND_5GHZ]->channels == NULL)
+ {
+ hddLog(VOS_TRACE_LEVEL_ERROR,
+ FL("Not enough memory to allocate channels"));
+ vos_mem_free(wiphy->bands[IEEE80211_BAND_2GHZ]->channels);
+ wiphy->bands[IEEE80211_BAND_2GHZ]->channels = NULL;
+ return -ENOMEM;
+ }
+ vos_mem_copy(wiphy->bands[IEEE80211_BAND_5GHZ]->channels,
+ &hdd_channels_5_GHZ[0],
+ sizeof(hdd_channels_5_GHZ));
+ }
for (i = 0; i < IEEE80211_NUM_BANDS; i++)
{
@@ -5865,16 +5956,15 @@
}
}
}
-
/* This function registers for all frame which supplicant is interested in */
void wlan_hdd_cfg80211_register_frames(hdd_adapter_t* pAdapter)
{
tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(pAdapter);
/* Register for all P2P action, public action etc frames */
v_U16_t type = (SIR_MAC_MGMT_FRAME << 2) | ( SIR_MAC_MGMT_ACTION << 4);
-
ENTER();
-
+ /* Register frame indication call back */
+ sme_register_mgmt_frame_ind_callback(hHal, hdd_indicate_mgmt_frame);
/* Right now we are registering these frame when driver is getting
initialized. Once we will move to 2.6.37 kernel, in which we have
frame register ops, we will move this code as a part of that */
@@ -6132,10 +6222,16 @@
}
-v_U8_t* wlan_hdd_cfg80211_get_ie_ptr(v_U8_t *pIes, int length, v_U8_t eid)
+v_U8_t* wlan_hdd_cfg80211_get_ie_ptr(
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0))
+ const v_U8_t *pIes,
+#else
+ v_U8_t *pIes,
+#endif
+ int length, v_U8_t eid)
{
int left = length;
- v_U8_t *ptr = pIes;
+ v_U8_t *ptr = (v_U8_t *)pIes;
v_U8_t elem_id,elem_len;
while(left >= 2)
@@ -8377,7 +8473,13 @@
#ifdef FEATURE_WLAN_TDLS
static int wlan_hdd_tdls_add_station(struct wiphy *wiphy,
- struct net_device *dev, u8 *mac, bool update, tCsrStaParams *StaParams)
+ struct net_device *dev,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0))
+ const u8 *mac,
+#else
+ u8 *mac,
+#endif
+ bool update, tCsrStaParams *StaParams)
{
hdd_context_t *pHddCtx = wiphy_priv(wiphy);
hddTdlsPeer_t *pTdlsPeer;
@@ -8610,7 +8712,11 @@
static int __wlan_hdd_change_station(struct wiphy *wiphy,
struct net_device *dev,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0))
+ const u8 *mac,
+#else
u8 *mac,
+#endif
struct station_parameters *params)
{
VOS_STATUS status = VOS_STATUS_SUCCESS;
@@ -8783,10 +8889,17 @@
return status;
}
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0))
+static int wlan_hdd_change_station(struct wiphy *wiphy,
+ struct net_device *dev,
+ const u8 *mac,
+ struct station_parameters *params)
+#else
static int wlan_hdd_change_station(struct wiphy *wiphy,
struct net_device *dev,
u8 *mac,
struct station_parameters *params)
+#endif
{
int ret;
@@ -11478,12 +11591,20 @@
* This function is used to parse WPA/RSN IE's.
*/
int wlan_hdd_cfg80211_set_ie( hdd_adapter_t *pAdapter,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0))
+ const u8 *ie,
+#else
u8 *ie,
+#endif
size_t ie_len
)
{
hdd_wext_state_t *pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter);
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0))
+ const u8 *genie = ie;
+#else
u8 *genie = ie;
+#endif
v_U16_t remLen = ie_len;
#ifdef FEATURE_WLAN_WAPI
v_U32_t akmsuite[MAX_NUM_AKM_SUITES];
@@ -11644,7 +11765,7 @@
/* populating as ADDIE in beacon frames */
if (ccmCfgSetStr(WLAN_HDD_GET_HAL_CTX(pAdapter),
- WNI_CFG_PROBE_RSP_BCN_ADDNIE_DATA, genie - 2, eLen + 2,
+ WNI_CFG_PROBE_RSP_BCN_ADDNIE_DATA, (u8 *)genie - 2, eLen + 2,
NULL, eANI_BOOLEAN_FALSE)== eHAL_STATUS_SUCCESS)
{
if (ccmCfgSetInt(WLAN_HDD_GET_HAL_CTX(pAdapter),
@@ -11842,7 +11963,13 @@
* Parse the received IE to find the WPA IE
*
*/
-static bool hdd_isWPAIEPresent(u8 *ie, u8 ie_len)
+static bool hdd_isWPAIEPresent(
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0))
+ const u8 *ie,
+#else
+ u8 *ie,
+#endif
+ u8 ie_len)
{
v_U8_t eLen = 0;
v_U16_t remLen = ie_len;
@@ -11878,9 +12005,9 @@
* This function is used to initialize the security
* parameters during connect operation.
*/
-int wlan_hdd_cfg80211_set_privacy( hdd_adapter_t *pAdapter,
+int wlan_hdd_cfg80211_set_privacy(hdd_adapter_t *pAdapter,
struct cfg80211_connect_params *req
- )
+ )
{
int status = 0;
hdd_wext_state_t *pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter);
@@ -12212,12 +12339,11 @@
{
return status;
}
-
- if (pHddStaCtx->conn_info.connState == eConnectionState_Connecting)
- {
- sme_abortConnection(WLAN_HDD_GET_HAL_CTX(pAdapter),
+ /* Indicate sme of disconnect so that in progress connection or preauth
+ * can be aborted
+ */
+ sme_abortConnection(WLAN_HDD_GET_HAL_CTX(pAdapter),
pAdapter->sessionId);
- }
pHddCtx->isAmpAllowed = VOS_TRUE;
/* Need to apply spin lock before decreasing active sessions
@@ -12544,9 +12670,9 @@
hdd_wext_state_t *pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter);
tCsrRoamProfile *pRoamProfile;
int status;
- bool alloc_bssid = VOS_FALSE;
hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
+ tSirMacAddr bssid;
ENTER();
@@ -12602,6 +12728,7 @@
"%s:ccmCfgStInt faild for WNI_CFG_IBSS_AUTO_BSSID", __func__);
return -EIO;
}
+ vos_mem_copy((v_U8_t *)bssid, (v_U8_t *)params->bssid, sizeof(bssid));
}
else if(pHddCtx->cfg_ini->isCoalesingInIBSSAllowed == 0)
{
@@ -12612,17 +12739,10 @@
"%s:ccmCfgStInt faild for WNI_CFG_IBSS_AUTO_BSSID", __func__);
return -EIO;
}
- params->bssid = vos_mem_malloc(VOS_MAC_ADDR_SIZE);
- if (!params->bssid)
- {
- hddLog (VOS_TRACE_LEVEL_ERROR,
- "%s:Failed memory allocation", __func__);
- return -EIO;
- }
- vos_mem_copy((v_U8_t *)params->bssid,
+
+ vos_mem_copy((v_U8_t *)bssid,
(v_U8_t *)&pHddCtx->cfg_ini->IbssBssid.bytes[0],
- VOS_MAC_ADDR_SIZE);
- alloc_bssid = VOS_TRUE;
+ sizeof(bssid));
}
/* Set Channel */
@@ -12693,19 +12813,10 @@
pHddStaCtx->conn_info.operationChannel);
if (0 > status)
- {
hddLog(VOS_TRACE_LEVEL_ERROR, "%s: connect failed", __func__);
- return status;
- }
- if (NULL != params->bssid &&
- pHddCtx->cfg_ini->isCoalesingInIBSSAllowed == 0 &&
- alloc_bssid == VOS_TRUE)
- {
- vos_mem_free(params->bssid);
- }
EXIT();
- return 0;
+ return status;
}
static int wlan_hdd_cfg80211_join_ibss( struct wiphy *wiphy,
@@ -13093,9 +13204,13 @@
return ret;
}
-
static int __wlan_hdd_cfg80211_get_station(struct wiphy *wiphy, struct net_device *dev,
- u8* mac, struct station_info *sinfo)
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0))
+ const u8* mac,
+#else
+ u8* mac,
+#endif
+ struct station_info *sinfo)
{
hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR( dev );
hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
@@ -13545,9 +13660,13 @@
EXIT();
return 0;
}
-
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0))
+static int wlan_hdd_cfg80211_get_station(struct wiphy *wiphy, struct net_device *dev,
+ const u8* mac, struct station_info *sinfo)
+#else
static int wlan_hdd_cfg80211_get_station(struct wiphy *wiphy, struct net_device *dev,
u8* mac, struct station_info *sinfo)
+#endif
{
int ret;
@@ -13814,9 +13933,14 @@
struct net_device *dev,
struct station_del_parameters *param)
#else
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0))
+static int wlan_hdd_cfg80211_del_station(struct wiphy *wiphy,
+ struct net_device *dev, const u8 *mac)
+#else
static int wlan_hdd_cfg80211_del_station(struct wiphy *wiphy,
struct net_device *dev, u8 *mac)
#endif
+#endif
{
int ret;
struct tagCsrDelStaParams delStaParams;
@@ -13845,7 +13969,13 @@
}
static int __wlan_hdd_cfg80211_add_station(struct wiphy *wiphy,
- struct net_device *dev, u8 *mac, struct station_parameters *params)
+ struct net_device *dev,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0))
+ const u8 *mac,
+#else
+ u8 *mac,
+#endif
+ struct station_parameters *params)
{
hdd_adapter_t *pAdapter;
hdd_context_t *pHddCtx;
@@ -13890,8 +14020,14 @@
return status;
}
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0))
+static int wlan_hdd_cfg80211_add_station(struct wiphy *wiphy,
+ struct net_device *dev, const u8 *mac,
+ struct station_parameters *params)
+#else
static int wlan_hdd_cfg80211_add_station(struct wiphy *wiphy,
struct net_device *dev, u8 *mac, struct station_parameters *params)
+#endif
{
int ret;
@@ -14704,6 +14840,11 @@
MTRACE(vos_trace(VOS_MODULE_ID_HDD,
TRACE_CODE_HDD_CFG80211_SCHED_SCAN_STOP,
pAdapter->sessionId, pAdapter->device_mode));
+
+ INIT_COMPLETION(pAdapter->pno_comp_var);
+ pnoRequest.statusCallback = hdd_cfg80211_sched_scan_start_status_cb;
+ pnoRequest.callbackContext = pAdapter;
+ pAdapter->pno_req_status = 0;
status = sme_SetPreferredNetworkList(hHal, &pnoRequest,
pAdapter->sessionId,
NULL, pAdapter);
@@ -14714,7 +14855,22 @@
ret = -EINVAL;
goto error;
}
- pHddCtx->isPnoEnable = FALSE;
+ ret = wait_for_completion_timeout(
+ &pAdapter->pno_comp_var,
+ msecs_to_jiffies(WLAN_WAIT_TIME_PNO));
+ if (0 >= ret)
+ {
+ // Did not receive the response for PNO disable in time.
+ // Assuming the PNO disable was success.
+ // Returning error from here, because we timeout, results
+ // in side effect of Wifi (Wifi Setting) not to work.
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
+ FL("Timed out waiting for PNO to be disabled"));
+ ret = 0;
+ }
+
+ ret = pAdapter->pno_req_status;
+ pHddCtx->isPnoEnable = (ret == 0) ? FALSE : TRUE;
error:
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
@@ -16265,7 +16421,11 @@
return err;
}
-static int wlan_hdd_cfg80211_testmode(struct wiphy *wiphy, void *data, int len)
+static int wlan_hdd_cfg80211_testmode(struct wiphy *wiphy,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0))
+ struct wireless_dev *wdev,
+#endif
+ void *data, int len)
{
int ret;
diff --git a/CORE/HDD/src/wlan_hdd_early_suspend.c b/CORE/HDD/src/wlan_hdd_early_suspend.c
index 9c4f047..d761113 100644
--- a/CORE/HDD/src/wlan_hdd_early_suspend.c
+++ b/CORE/HDD/src/wlan_hdd_early_suspend.c
@@ -2329,6 +2329,7 @@
pHddCtx->cfg_ini= NULL;
wiphy_unregister(pHddCtx->wiphy);
+ hdd_wlan_free_wiphy_channels(pHddCtx->wiphy);
wiphy_free(pHddCtx->wiphy);
}
vos_preClose(&pVosContext);
diff --git a/CORE/HDD/src/wlan_hdd_ftm.c b/CORE/HDD/src/wlan_hdd_ftm.c
index 0e56a65..cbe31d0 100644
--- a/CORE/HDD/src/wlan_hdd_ftm.c
+++ b/CORE/HDD/src/wlan_hdd_ftm.c
@@ -4472,7 +4472,7 @@
status = VOS_STATUS_E_FAILURE;
goto done;
}
- *pTxPwr = ((((pMsgBody->GetTxPowerReport.pwrTemplateIndex & 0x1F) + 4)*50)/100);
+ *pTxPwr = pMsgBody->GetTxPowerReport.pwrTemplateIndex;
done:
@@ -4495,11 +4495,8 @@
static VOS_STATUS wlan_ftm_priv_get_txrate(hdd_adapter_t *pAdapter,char *pTxRate)
{
- uPttMsgs *pMsgBody;
- VOS_STATUS status;
- v_U16_t rate_index,ii;
- long ret;
-
+ VOS_STATUS status = VOS_STATUS_SUCCESS;
+ v_U16_t ii;
hdd_context_t *pHddCtx = (hdd_context_t *)pAdapter->pHddCtx;
if (pHddCtx->ftm.ftm_state != WLAN_FTM_STARTED)
@@ -4509,51 +4506,8 @@
return VOS_STATUS_E_FAILURE;
}
- if (NULL == pMsgBuf)
- {
- VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,
- "%s:pMsgBuf is NULL", __func__);
- return VOS_STATUS_E_NOMEM;
- }
- vos_mem_set(pMsgBuf, sizeof(tPttMsgbuffer), 0);
- init_completion(&pHddCtx->ftm.ftm_comp_var);
- pMsgBuf->msgId = PTT_MSG_GET_TX_POWER_REPORT;
- pMsgBuf->msgBodyLength = sizeof(tMsgPttGetTxPowerReport) + PTT_HEADER_LENGTH;
-
- pMsgBody = &pMsgBuf->msgBody;
-
- status = wlan_ftm_postmsg((v_U8_t*)pMsgBuf,pMsgBuf->msgBodyLength);
-
- if (status != VOS_STATUS_SUCCESS)
- {
- VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,
- "%s:wlan_ftm_postmsg failed", __func__);
- status = VOS_STATUS_E_FAILURE;
- goto done;
- }
- ret = wait_for_completion_interruptible_timeout(&pHddCtx->ftm.ftm_comp_var,
- msecs_to_jiffies(WLAN_FTM_COMMAND_TIME_OUT));
- if (0 >= ret )
- {
- VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- FL("wait on ftm_comp_var failed %ld"), ret);
- }
-
- if (pMsgBuf->msgResponse == PTT_STATUS_SUCCESS) {
-
- rate_index = pMsgBody->GetTxPowerReport.rate;
- }
- else {
- /*Return the default rate*/
- //rate_index = HAL_PHY_RATE_11A_6_MBPS;
- VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,
- "%s: PTT_MSG_GET_TX_POWER_REPORT failed", __func__);
- status = VOS_STATUS_E_FAILURE;
- goto done;
- }
-
for(ii = 0; ii < SIZE_OF_TABLE(rateName_rateIndex_tbl); ii++) {
- if(rateName_rateIndex_tbl[ii].rate_index == rate_index)
+ if(rateName_rateIndex_tbl[ii].rate_index == ftm_status.frameParams.rate)
break;
}
if(ii >= SIZE_OF_TABLE(rateName_rateIndex_tbl))
@@ -4563,8 +4517,8 @@
goto done;
}
strlcpy(pTxRate,rateName_rateIndex_tbl[ii].rate_str, WE_FTM_MAX_STR_LEN);
-done:
+done:
return status;
}
diff --git a/CORE/HDD/src/wlan_hdd_hostapd.c b/CORE/HDD/src/wlan_hdd_hostapd.c
index 2cc6251..4ec80df 100644
--- a/CORE/HDD/src/wlan_hdd_hostapd.c
+++ b/CORE/HDD/src/wlan_hdd_hostapd.c
@@ -1179,13 +1179,6 @@
vos_mem_free(pSapEvent->sapevt.sapAssocStaListEvent.pAssocStas);// Release caller allocated memory here
pSapEvent->sapevt.sapAssocStaListEvent.pAssocStas = NULL;
return VOS_STATUS_SUCCESS;
- case eSAP_INDICATE_MGMT_FRAME:
- hdd_indicateMgmtFrame( pHostapdAdapter,
- pSapEvent->sapevt.sapManagementFrameInfo.nFrameLength,
- pSapEvent->sapevt.sapManagementFrameInfo.pbFrames,
- pSapEvent->sapevt.sapManagementFrameInfo.frameType,
- pSapEvent->sapevt.sapManagementFrameInfo.rxChan, 0);
- return VOS_STATUS_SUCCESS;
case eSAP_REMAIN_CHAN_READY:
hdd_remainChanReadyHandler( pHostapdAdapter );
return VOS_STATUS_SUCCESS;
@@ -4954,8 +4947,11 @@
hdd_adapter_t *pHostapdAdapter = NULL;
v_CONTEXT_t pVosContext= NULL;
- pWlanHostapdDev = alloc_netdev_mq(sizeof(hdd_adapter_t), iface_name, ether_setup, NUM_TX_QUEUES);
-
+ pWlanHostapdDev = alloc_netdev_mq(sizeof(hdd_adapter_t), iface_name,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0))
+ NET_NAME_UNKNOWN,
+#endif
+ ether_setup, NUM_TX_QUEUES);
if (pWlanHostapdDev != NULL)
{
pHostapdAdapter = netdev_priv(pWlanHostapdDev);
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index 438e743..55652aa 100755
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -207,7 +207,14 @@
void hdd_set_wlan_suspend_mode(bool suspend);
v_U16_t hdd_select_queue(struct net_device *dev,
- struct sk_buff *skb);
+ struct sk_buff *skb
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,13,0))
+ , void *accel_priv
+#endif
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0))
+ , select_queue_fallback_t fallback
+#endif
+);
#ifdef WLAN_FEATURE_PACKET_FILTERING
static void hdd_set_multicast_list(struct net_device *dev);
@@ -2277,6 +2284,9 @@
hdd_scaninfo_t *pScanInfo = NULL;
int ret = 0;
int status;
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0))
+ struct cfg80211_mgmt_tx_params params;
+#endif
ENTER();
/*
@@ -3109,6 +3119,16 @@
vos_mem_free(buf);
buf = NULL;
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0))
+ params.chan = &chan;
+ params.offchan = 0;
+ params.wait = dwellTime;
+ params.buf = finalBuf;
+ params.len = finalLen;
+ params.no_cck = 1;
+ params.dont_wait_for_ack = 1;
+ ret = wlan_hdd_mgmt_tx(NULL, &pAdapter->wdev, ¶ms, &cookie);
+#else
wlan_hdd_mgmt_tx( NULL,
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0))
&(pAdapter->wdev),
@@ -3121,6 +3141,7 @@
#endif
dwellTime, finalBuf, finalLen, 1,
1, &cookie );
+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)*/
vos_mem_free(finalBuf);
}
else if (strncmp(command, "GETROAMSCANCHANNELMINTIME", 25) == 0)
@@ -3706,22 +3727,14 @@
if (VOS_TRUE == vos_mem_compare(targetApBssid,
pHddStaCtx->conn_info.bssId, sizeof(tSirMacAddr)))
{
- /* Reassoc to same AP, only supported for Open Security*/
- if ((pHddStaCtx->conn_info.ucEncryptionType ||
- pHddStaCtx->conn_info.mcEncryptionType))
- {
- hddLog(LOGE,
- FL("Reassoc to same AP, only supported for Open Security"));
- ret = -ENOTSUPP;
- goto exit;
- }
- hddLog(LOG1,
- FL("11r Reassoc BSSID is same as currently associated AP bssid"));
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
+ "%s:11r Reassoc BSSID is same as currently associated AP bssid",
+ __func__);
sme_GetModifyProfileFields(hHal, pAdapter->sessionId,
&modProfileFields);
sme_RoamReassoc(hHal, pAdapter->sessionId,
NULL, modProfileFields, &roamId, 1);
- goto exit;
+ return 0;
}
/* Check channel number is a valid channel number */
@@ -3730,8 +3743,7 @@
{
hddLog(VOS_TRACE_LEVEL_ERROR,
"%s: Invalid Channel [%d]", __func__, channel);
- ret = -EINVAL;
- goto exit;
+ return -EINVAL;
}
trigger = eSME_ROAM_TRIGGER_SCAN;
@@ -4352,7 +4364,13 @@
int set_value;
/* Move pointer to ahead of TDLSOFFCH*/
value += 26;
- sscanf(value, "%d", &set_value);
+ if (!(sscanf(value, "%d", &set_value))) {
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
+ FL("No input identified"));
+ ret = -EINVAL;
+ goto exit;
+ }
+
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
"%s: Tdls offchannel offset:%d",
__func__, set_value);
@@ -4368,7 +4386,13 @@
int set_value;
/* Move pointer to ahead of tdlsoffchnmode*/
value += 18;
- sscanf(value, "%d", &set_value);
+ ret = sscanf(value, "%d", &set_value);
+ if (ret != 1) {
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
+ FL("No input identified"));
+ ret = -EINVAL;
+ goto exit;
+ }
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
"%s: Tdls offchannel mode:%d",
__func__, set_value);
@@ -6229,8 +6253,11 @@
/*
* cfg80211 initialization and registration....
*/
- pWlanDev = alloc_netdev_mq(sizeof( hdd_adapter_t ), name, ether_setup, NUM_TX_QUEUES);
-
+ pWlanDev = alloc_netdev_mq(sizeof( hdd_adapter_t ), name,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0))
+ NET_NAME_UNKNOWN,
+#endif
+ ether_setup, NUM_TX_QUEUES);
if(pWlanDev != NULL)
{
@@ -6698,7 +6725,9 @@
/* switch to the DTIM specified in cfg.ini */
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
- "Switch to DTIM %d", powerRequest.uListenInterval);
+ "Switch to DTIM %d Listen interval %d",
+ powerRequest.uDTIMPeriod,
+ powerRequest.uListenInterval);
sme_SetPowerParams( pHddCtx->hHal, &powerRequest, TRUE);
break;
@@ -7324,20 +7353,20 @@
ENTER();
- if ( VOS_TRUE == bCloseSession )
- {
- status = hdd_sta_id_hash_detach(pAdapter);
- if (status != VOS_STATUS_SUCCESS)
- hddLog(VOS_TRACE_LEVEL_ERROR,
- FL("sta id hash detach failed"));
- }
-
pScanInfo = &pHddCtx->scan_info;
switch(pAdapter->device_mode)
{
+ case WLAN_HDD_IBSS:
+ if ( VOS_TRUE == bCloseSession )
+ {
+ status = hdd_sta_id_hash_detach(pAdapter);
+ if (status != VOS_STATUS_SUCCESS)
+ hddLog(VOS_TRACE_LEVEL_ERROR,
+ FL("sta id hash detach failed"));
+ }
+
case WLAN_HDD_INFRA_STATION:
case WLAN_HDD_P2P_CLIENT:
- case WLAN_HDD_IBSS:
case WLAN_HDD_P2P_DEVICE:
{
hdd_station_ctx_t *pstation = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
@@ -7463,6 +7492,14 @@
case WLAN_HDD_SOFTAP:
case WLAN_HDD_P2P_GO:
+ if ( VOS_TRUE == bCloseSession )
+ {
+ status = hdd_sta_id_hash_detach(pAdapter);
+ if (status != VOS_STATUS_SUCCESS)
+ hddLog(VOS_TRACE_LEVEL_ERROR,
+ FL("sta id hash detach failed"));
+ }
+
//Any softap specific cleanup here...
if (pAdapter->device_mode == WLAN_HDD_P2P_GO) {
while (pAdapter->is_roc_inprogress) {
@@ -8267,7 +8304,14 @@
--------------------------------------------------------------------------*/
v_U16_t hdd_select_queue(struct net_device *dev,
- struct sk_buff *skb)
+ struct sk_buff *skb
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,13,0))
+ , void *accel_priv
+#endif
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0))
+ , select_queue_fallback_t fallback
+#endif
+)
{
return hdd_wmm_select_queue(dev, skb);
}
@@ -8472,11 +8516,11 @@
{
VOS_STATUS vosStatus;
v_CONTEXT_t pVosContext = pHddCtx->pvosContext;
- struct wiphy *wiphy = pHddCtx->wiphy;
long ret;
hdd_mon_ctx_t *pMonCtx = NULL;
v_U32_t magic;
struct completion cmpVar;
+
hdd_adapter_t *pAdapter = hdd_get_adapter(pHddCtx,WLAN_HDD_MONITOR);
if(pAdapter == NULL || pVosContext == NULL)
{
@@ -8533,15 +8577,26 @@
nl_srv_exit();
#endif
- if (pHddCtx->cfg_ini)
- {
- kfree(pHddCtx->cfg_ini);
- pHddCtx->cfg_ini= NULL;
- }
hdd_close_all_adapters( pHddCtx );
-
- wiphy_free(wiphy) ;
-
+}
+/**
+ * hdd_wlan_free_wiphy_channels - free Channel pointer for wiphy
+ * @ wiphy: the wiphy to validate against
+ *
+ * Return: void
+ */
+void hdd_wlan_free_wiphy_channels(struct wiphy *wiphy)
+{
+ int i =0;
+ for (i = 0; i < IEEE80211_NUM_BANDS; i++)
+ {
+ if (NULL != wiphy->bands[i] &&
+ (NULL != wiphy->bands[i]->channels))
+ {
+ vos_mem_free(wiphy->bands[i]->channels);
+ wiphy->bands[i]->channels = NULL;
+ }
+ }
}
/**---------------------------------------------------------------------------
@@ -8572,7 +8627,7 @@
{
hddLog(VOS_TRACE_LEVEL_ERROR,"%s: MONITOR MODE",__func__);
wlan_hdd_mon_close(pHddCtx);
- return;
+ goto free_hdd_ctx;
}
else if (VOS_FTM_MODE != hdd_get_conparam())
{
@@ -8883,6 +8938,7 @@
if (VOS_FTM_MODE != hdd_get_conparam())
{
wiphy_unregister(wiphy) ;
+ hdd_wlan_free_wiphy_channels(wiphy);
}
wiphy_free(wiphy) ;
if (hdd_is_ssr_required())
@@ -9175,6 +9231,7 @@
struct nlmsghdr *nlh;
tAniMsgHdr *ani_hdr;
int flags = GFP_KERNEL;
+ void *nl_data = NULL;
if (in_interrupt() || irqs_disabled() || in_atomic())
flags = GFP_ATOMIC;
@@ -9202,6 +9259,13 @@
nlh->nlmsg_len = NLMSG_LENGTH((sizeof(tAniMsgHdr)));
skb_put(skb, NLMSG_SPACE(sizeof(tAniMsgHdr)));
break;
+ case WLAN_MSG_RPS_ENABLE_IND:
+ ani_hdr->length = len;
+ nlh->nlmsg_len = NLMSG_LENGTH((sizeof(tAniMsgHdr) + len));
+ nl_data = (char *)ani_hdr + sizeof(tAniMsgHdr);
+ memcpy(nl_data, data, len);
+ skb_put(skb, NLMSG_SPACE(sizeof(tAniMsgHdr) + len));
+ break;
default:
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
"Attempt to send unknown nlink message %d", type);
@@ -9524,6 +9588,46 @@
return;
}
+static void hdd_dp_util_send_rps_ind(hdd_context_t *hdd_ctxt)
+{
+ hdd_adapter_t *adapter;
+ hdd_adapter_list_node_t *adapter_node, *next;
+ VOS_STATUS status = VOS_STATUS_SUCCESS;
+ struct wlan_rps_data rps_data;
+ int count;
+
+ if(!hdd_ctxt->cfg_ini->rps_mask)
+ {
+ return;
+ }
+
+ for (count=0; count < WLAN_SVC_IFACE_NUM_QUEUES; count++)
+ {
+ rps_data.cpu_map[count] = hdd_ctxt->cfg_ini->rps_mask;
+ }
+
+ rps_data.num_queues = WLAN_SVC_IFACE_NUM_QUEUES;
+
+ hddLog(LOG1, FL("0x%x 0x%x 0x%x 0x%x 0x%x 0x%x"),
+ rps_data.cpu_map[0], rps_data.cpu_map[1],rps_data.cpu_map[2],
+ rps_data.cpu_map[3], rps_data.cpu_map[4], rps_data.cpu_map[5]);
+
+ status = hdd_get_front_adapter (hdd_ctxt, &adapter_node);
+
+ while (NULL != adapter_node && VOS_STATUS_SUCCESS == status)
+ {
+ adapter = adapter_node->pAdapter;
+ if (NULL != adapter) {
+ strlcpy(rps_data.ifname, adapter->dev->name,
+ sizeof(rps_data.ifname));
+ wlan_hdd_send_svc_nlink_msg(WLAN_MSG_RPS_ENABLE_IND,
+ (void *)&rps_data,sizeof(rps_data));
+ }
+ status = hdd_get_next_adapter (hdd_ctxt, adapter_node, &next);
+ adapter_node = next;
+ }
+}
+
/**---------------------------------------------------------------------------
\brief hdd_wlan_startup() - HDD init function
@@ -10375,6 +10479,7 @@
{
hddLog(VOS_TRACE_LEVEL_INFO, FL("Registered IPv4 notifier"));
}
+ hdd_dp_util_send_rps_ind(pHddCtx);
goto success;
@@ -10409,6 +10514,8 @@
err_unregister_wiphy:
#endif
wiphy_unregister(wiphy) ;
+ hdd_wlan_free_wiphy_channels(wiphy);
+
err_vosstop:
vos_stop(pVosContext);
@@ -11369,8 +11476,11 @@
* the driver.
*
*/
-
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0))
+ cfg80211_rx_unprot_mlme_mgmt(pAdapterNode->pAdapter->dev, (u_int8_t*)mgmt, len);
+#else
cfg80211_send_unprot_deauth(pAdapterNode->pAdapter->dev, (u_int8_t*)mgmt, len );
+#endif
}
status = hdd_get_next_adapter ( pHddCtx, pAdapterNode, &pNext );
pAdapterNode = pNext;
@@ -11578,6 +11688,52 @@
return 0;
}
+/**
+ * hdd_indicate_mgmt_frame() - Wrapper to indicate management frame to
+ * user space
+ * @frame_ind: Management frame data to be informed.
+ *
+ * This function is used to indicate management frame to
+ * user space
+ *
+ * Return: None
+ *
+ */
+void hdd_indicate_mgmt_frame(tSirSmeMgmtFrameInd *frame_ind)
+{
+ hdd_context_t *hdd_ctx = NULL;
+ hdd_adapter_t *adapter = NULL;
+ v_CONTEXT_t vos_context = NULL;
+
+ /* Get the global VOSS context.*/
+ vos_context = vos_get_global_context(VOS_MODULE_ID_SYS, NULL);
+ if (!vos_context) {
+ hddLog(LOGE, FL("Global VOS context is Null"));
+ return;
+ }
+ /* Get the HDD context.*/
+ hdd_ctx =
+ (hdd_context_t *)vos_get_context(VOS_MODULE_ID_HDD, vos_context );
+
+ if (0 != wlan_hdd_validate_context(hdd_ctx))
+ {
+ return;
+ }
+ adapter = hdd_get_adapter_by_sme_session_id(hdd_ctx,
+ frame_ind->sessionId);
+
+ if ((NULL != adapter) &&
+ (WLAN_HDD_ADAPTER_MAGIC == adapter->magic))
+ __hdd_indicate_mgmt_frame(adapter,
+ frame_ind->frameLen,
+ frame_ind->frameBuf,
+ frame_ind->frameType,
+ frame_ind->rxChan,
+ frame_ind->rxRssi);
+ return;
+
+}
+
VOS_STATUS wlan_hdd_cancel_remain_on_channel(hdd_context_t *pHddCtx)
{
hdd_adapter_t *pAdapter;
diff --git a/CORE/HDD/src/wlan_hdd_p2p.c b/CORE/HDD/src/wlan_hdd_p2p.c
index 6c78f00..bf84bab 100644
--- a/CORE/HDD/src/wlan_hdd_p2p.c
+++ b/CORE/HDD/src/wlan_hdd_p2p.c
@@ -906,7 +906,19 @@
// Check for cached action frame
if ( pRemainChanCtx->action_pkt_buff.frame_length != 0 )
{
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0))
+ cfg80211_rx_mgmt(pAdapter->dev->ieee80211_ptr,
+ pRemainChanCtx->action_pkt_buff.freq, 0,
+ pRemainChanCtx->action_pkt_buff.frame_ptr,
+ pRemainChanCtx->action_pkt_buff.frame_length,
+ NL80211_RXMGMT_FLAG_ANSWERED);
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0))
+ cfg80211_rx_mgmt(pAdapter->dev->ieee80211_ptr,
+ pRemainChanCtx->action_pkt_buff.freq, 0,
+ pRemainChanCtx->action_pkt_buff.frame_ptr,
+ pRemainChanCtx->action_pkt_buff.frame_length,
+ NL80211_RXMGMT_FLAG_ANSWERED, GFP_ATOMIC);
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0))
cfg80211_rx_mgmt( pAdapter->dev->ieee80211_ptr,
pRemainChanCtx->action_pkt_buff.freq, 0,
pRemainChanCtx->action_pkt_buff.frame_ptr,
@@ -1447,13 +1459,12 @@
vos_mem_copy( cfgState->buf, buf, len);
+ mutex_lock(&pHddCtx->roc_lock);
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38))
if( cfgState->remain_on_chan_ctx )
{
- mutex_lock(&pHddCtx->roc_lock);
cfgState->action_cookie = cfgState->remain_on_chan_ctx->cookie;
*cookie = cfgState->action_cookie;
- mutex_unlock(&pHddCtx->roc_lock);
}
else
{
@@ -1463,6 +1474,7 @@
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38))
}
#endif
+ mutex_unlock(&pHddCtx->roc_lock);
}
if ( (WLAN_HDD_INFRA_STATION == pAdapter->device_mode) ||
@@ -1531,7 +1543,10 @@
return 0;
}
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0))
+int wlan_hdd_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,
+ struct cfg80211_mgmt_tx_params *params, u64 *cookie)
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0))
int wlan_hdd_mgmt_tx( struct wiphy *wiphy, struct wireless_dev *wdev,
struct ieee80211_channel *chan, bool offchan,
#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0))
@@ -1565,7 +1580,12 @@
int ret;
vos_ssr_protect(__func__);
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0))
+ ret = __wlan_hdd_mgmt_tx(wiphy, wdev, params->chan, params->offchan,
+ params->wait, params->buf, params->len,
+ params->no_cck, params->dont_wait_for_ack,
+ cookie);
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0))
ret = __wlan_hdd_mgmt_tx(wiphy, wdev,
chan, offchan,
#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0))
@@ -2267,12 +2287,12 @@
return ;
}
-void hdd_indicateMgmtFrame( hdd_adapter_t *pAdapter,
+void __hdd_indicate_mgmt_frame(hdd_adapter_t *pAdapter,
tANI_U32 nFrameLength,
tANI_U8* pbFrames,
tANI_U8 frameType,
tANI_U32 rxChan,
- tANI_S8 rxRssi )
+ tANI_S8 rxRssi)
{
tANI_U16 freq;
tANI_U16 extend_time;
@@ -2378,7 +2398,6 @@
}
cfgState = WLAN_HDD_GET_CFG_STATE_PTR( pAdapter );
- pRemainChanCtx = cfgState->remain_on_chan_ctx;
if ((type == SIR_MAC_MGMT_FRAME) &&
(subType == SIR_MAC_MGMT_ACTION))
@@ -2425,6 +2444,9 @@
}
}
#endif
+ mutex_lock(&pHddCtx->roc_lock);
+ pRemainChanCtx = cfgState->remain_on_chan_ctx;
+
if (pRemainChanCtx != NULL && VOS_TIMER_STATE_RUNNING
== vos_timer_getCurrentState(&pRemainChanCtx->hdd_remain_on_chan_timer))
{
@@ -2475,6 +2497,7 @@
"Frames are pending. dropping frame !!!",
__func__);
}
+ mutex_unlock(&pHddCtx->roc_lock);
return;
}
}
@@ -2485,15 +2508,17 @@
hddLog( LOG1, "%s:"
"Rcvd action frame after timer expired ", __func__);
+ mutex_unlock(&pHddCtx->roc_lock);
+
if (((actionFrmType == WLAN_HDD_PROV_DIS_RESP) &&
(cfgState->actionFrmState == HDD_PD_REQ_ACK_PENDING)) ||
((actionFrmType == WLAN_HDD_GO_NEG_RESP) &&
(cfgState->actionFrmState == HDD_GO_NEG_REQ_ACK_PENDING)))
{
- hddLog(LOG1, "%s: ACK_PENDING and But received RESP for Action frame ",
+ hddLog(LOG1, "%s: ACK_PENDING and But received RESP for Action frame ",
__func__);
- hdd_sendActionCnf(pAdapter, TRUE);
- }
+ hdd_sendActionCnf(pAdapter, TRUE);
+ }
}
#ifdef FEATURE_WLAN_TDLS
else if(pbFrames[WLAN_HDD_PUBLIC_ACTION_FRAME_OFFSET+1] == WLAN_HDD_PUBLIC_ACTION_TDLS_DISC_RESP)
@@ -2543,8 +2568,13 @@
//Indicate Frame Over Normal Interface
hddLog( LOG1, FL("Indicate Frame over NL80211 Interface"));
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0))
+ cfg80211_rx_mgmt(pAdapter->dev->ieee80211_ptr, freq, 0, pbFrames,
+ nFrameLength, NL80211_RXMGMT_FLAG_ANSWERED);
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0))
+ cfg80211_rx_mgmt(pAdapter->dev->ieee80211_ptr, freq, 0, pbFrames,
+ nFrameLength, NL80211_RXMGMT_FLAG_ANSWERED, GFP_ATOMIC);
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0))
cfg80211_rx_mgmt( pAdapter->dev->ieee80211_ptr, freq, 0,
pbFrames, nFrameLength,
GFP_ATOMIC );
diff --git a/CORE/HDD/src/wlan_hdd_tdls.c b/CORE/HDD/src/wlan_hdd_tdls.c
index 7671f65..83b7704 100644
--- a/CORE/HDD/src/wlan_hdd_tdls.c
+++ b/CORE/HDD/src/wlan_hdd_tdls.c
@@ -56,7 +56,13 @@
static void wlan_hdd_tdls_implicit_send_discovery_request(tdlsCtx_t *pHddTdlsCtx);
#endif
-static u8 wlan_hdd_tdls_hash_key (u8 *mac)
+static u8 wlan_hdd_tdls_hash_key (
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0))
+ const u8 *mac
+#else
+ u8 *mac
+#endif
+ )
{
int i;
u8 key = 0;
@@ -1205,7 +1211,13 @@
if mac address doesn't exist, create a list and add, return pointer
return NULL if fails to get new mac address
*/
-hddTdlsPeer_t *wlan_hdd_tdls_get_peer(hdd_adapter_t *pAdapter, u8 *mac)
+hddTdlsPeer_t *wlan_hdd_tdls_get_peer(hdd_adapter_t *pAdapter,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0))
+ const u8 *mac
+#else
+ u8 *mac
+#endif
+ )
{
struct list_head *head;
hddTdlsPeer_t *peer;
@@ -1330,7 +1342,11 @@
}
void wlan_hdd_tdls_set_link_status(hdd_adapter_t *pAdapter,
- u8* mac,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0))
+ const u8 *mac,
+#else
+ u8 *mac,
+#endif
tTDLSLinkStatus linkStatus,
tTDLSLinkReason reason)
{
@@ -1465,7 +1481,11 @@
}
int wlan_hdd_tdls_set_peer_caps(hdd_adapter_t *pAdapter,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0))
+ const u8 *mac,
+#else
u8 *mac,
+#endif
tCsrStaParams *StaParams,
tANI_BOOLEAN isBufSta,
tANI_BOOLEAN isOffChannelSupported)
@@ -1848,7 +1868,12 @@
/* if peerMac is found, then it returns pointer to hddTdlsPeer_t
otherwise, it returns NULL
*/
-hddTdlsPeer_t *wlan_hdd_tdls_find_peer(hdd_adapter_t *pAdapter, u8 *mac,
+hddTdlsPeer_t *wlan_hdd_tdls_find_peer(hdd_adapter_t *pAdapter,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0))
+ const u8 *mac,
+#else
+ u8 *mac,
+#endif
tANI_BOOLEAN mutexLock)
{
u8 key;
@@ -2380,7 +2405,13 @@
* skip_self - if TRUE, skip this mac. otherwise, check all the peer list. if
mac is NULL, this argument is ignored, and check for all the peer list.
*/
-static hddTdlsPeer_t *wlan_hdd_tdls_find_progress_peer(hdd_adapter_t *pAdapter, u8 *mac, u8 skip_self)
+static hddTdlsPeer_t *wlan_hdd_tdls_find_progress_peer(hdd_adapter_t *pAdapter,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0))
+ const u8 *mac,
+#else
+ u8 *mac,
+#endif
+ u8 skip_self)
{
int i;
struct list_head *head;
@@ -2417,7 +2448,12 @@
return NULL;
}
-hddTdlsPeer_t *wlan_hdd_tdls_is_progress(hdd_context_t *pHddCtx, u8 *mac,
+hddTdlsPeer_t *wlan_hdd_tdls_is_progress(hdd_context_t *pHddCtx,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0))
+ const u8 *mac,
+#else
+ u8 *mac,
+#endif
u8 skip_self, tANI_BOOLEAN mutexLock)
{
hdd_adapter_list_node_t *pAdapterNode = NULL, *pNext = NULL;
diff --git a/CORE/HDD/src/wlan_hdd_tx_rx.c b/CORE/HDD/src/wlan_hdd_tx_rx.c
index 747f2a8..962e47f 100644
--- a/CORE/HDD/src/wlan_hdd_tx_rx.c
+++ b/CORE/HDD/src/wlan_hdd_tx_rx.c
@@ -1174,10 +1174,11 @@
"%s: Request firmware for recovery",__func__);
WLANTL_TLDebugMessage(WLANTL_DEBUG_FW_CLEANUP);
}
-
+ mutex_lock(&pHddCtx->roc_lock);
pRemainChanCtx = hdd_get_remain_on_channel_ctx(pHddCtx);
if (!pRemainChanCtx)
{
+ mutex_unlock(&pHddCtx->roc_lock);
if (pAdapter->hdd_stats.hddTxRxStats.continuousTxTimeoutCount >
HDD_TX_STALL_SSR_THRESHOLD)
{
@@ -1191,6 +1192,7 @@
}
else
{
+ mutex_unlock(&pHddCtx->roc_lock);
VOS_TRACE(VOS_MODULE_ID_HDD_DATA, VOS_TRACE_LEVEL_ERROR,
"Remain on channel in progress");
/* The supplicant can retry "P2P Invitation Request" for 120 times
diff --git a/CORE/HDD/src/wlan_hdd_wext.c b/CORE/HDD/src/wlan_hdd_wext.c
index fed4041..f567fd0 100644
--- a/CORE/HDD/src/wlan_hdd_wext.c
+++ b/CORE/HDD/src/wlan_hdd_wext.c
@@ -7061,20 +7061,8 @@
tpAniSirGlobal pMac = WLAN_HDD_GET_HAL_CTX(pAdapter);
v_U32_t roamId = 0;
tCsrRoamModifyProfileFields modProfileFields;
- hdd_station_ctx_t *pHddStaCtx =
- WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
- /* Reassoc to same AP, only supported for Open Security*/
- if ((pHddStaCtx->conn_info.ucEncryptionType ||
- pHddStaCtx->conn_info.mcEncryptionType))
- {
- hddLog(LOGE,
- FL("Reassoc to same AP, only supported for Open Security"));
- return -ENOTSUPP;
- }
- sme_GetModifyProfileFields(pMac,
- pAdapter->sessionId, &modProfileFields);
- sme_RoamReassoc(pMac, pAdapter->sessionId,
- NULL, modProfileFields, &roamId, 1);
+ sme_GetModifyProfileFields(pMac, pAdapter->sessionId, &modProfileFields);
+ sme_RoamReassoc(pMac, pAdapter->sessionId, NULL, modProfileFields, &roamId, 1);
return 0;
}
@@ -7310,6 +7298,12 @@
{
case WE_LOG_DUMP_CMD:
{
+ if (apps_args[0] == 26) {
+ if (!pHddCtx->cfg_ini->crash_inject_enabled) {
+ hddLog(LOGE, "Crash Inject ini disabled, Ignore Crash Inject");
+ return 0;
+ }
+ }
hddLog(LOG1, "%s: LOG_DUMP %d arg1 %d arg2 %d arg3 %d arg4 %d",
__func__, apps_args[0], apps_args[1], apps_args[2],
apps_args[3], apps_args[4]);
@@ -7324,6 +7318,13 @@
{
p2p_app_setP2pPs_t p2pNoA;
+ if (pAdapter->device_mode != WLAN_HDD_P2P_GO) {
+ hddLog(LOGE,
+ FL("Setting NoA is not allowed in Device mode:%d"),
+ pAdapter->device_mode);
+ return -EINVAL;
+ }
+
p2pNoA.opp_ps = apps_args[0];
p2pNoA.ctWindow = apps_args[1];
p2pNoA.duration = apps_args[2];
diff --git a/CORE/HDD/src/wlan_hdd_wmm.c b/CORE/HDD/src/wlan_hdd_wmm.c
index 8910878..14e93c4 100644
--- a/CORE/HDD/src/wlan_hdd_wmm.c
+++ b/CORE/HDD/src/wlan_hdd_wmm.c
@@ -2082,7 +2082,14 @@
@return : Qdisc queue index
===========================================================================*/
-v_U16_t hdd_hostapd_select_queue(struct net_device * dev, struct sk_buff *skb)
+v_U16_t hdd_hostapd_select_queue(struct net_device * dev, struct sk_buff *skb
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,13,0))
+ , void *accel_priv
+#endif
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0))
+ , select_queue_fallback_t fallbac
+#endif
+)
{
WLANTL_ACEnumType ac;
sme_QosWmmUpType up = SME_QOS_WMM_UP_BE;
diff --git a/CORE/MAC/inc/aniGlobal.h b/CORE/MAC/inc/aniGlobal.h
index 0623873..be90e1f 100644
--- a/CORE/MAC/inc/aniGlobal.h
+++ b/CORE/MAC/inc/aniGlobal.h
@@ -1067,6 +1067,7 @@
tANI_BOOLEAN miracastVendorConfig;
v_BOOL_t fActiveScanOnDFSChannels;
tAuthAckStatus authAckStatus;
+ sir_mgmt_frame_ind_callback mgmt_frame_ind_cb;
} tAniSirGlobal;
#ifdef FEATURE_WLAN_TDLS
diff --git a/CORE/MAC/inc/sirApi.h b/CORE/MAC/inc/sirApi.h
index cb9af1a..08291c8 100644
--- a/CORE/MAC/inc/sirApi.h
+++ b/CORE/MAC/inc/sirApi.h
@@ -3676,8 +3676,7 @@
typedef struct sSirSmeMgmtFrameInd
{
- tANI_U16 mesgType;
- tANI_U16 mesgLen;
+ tANI_U16 frameLen;
tANI_U32 rxChan;
tANI_U8 sessionId;
tANI_U8 frameType;
@@ -4701,6 +4700,23 @@
VOS_STATUS status, void *data);
typedef void (*tSirFWStatsCallback)(VOS_STATUS status,
tSirFwStatsResult *fwStatsRsp, void *pContext);
+typedef void (*sir_mgmt_frame_ind_callback)(tSirSmeMgmtFrameInd *frame_ind);
+
+
+/**
+ * struct sir_sme_mgmt_frame_cb_req - Register a
+ * management frame callback req
+ * @message_type: message id
+ * @length: msg length
+ * @callback: callback for management frame indication
+ */
+struct sir_sme_mgmt_frame_cb_req
+{
+ tANI_U16 message_type;
+ tANI_U16 length;
+ sir_mgmt_frame_ind_callback callback;
+};
+
typedef PACKED_PRE struct PACKED_POST
{
tANI_U32 msgLen;
diff --git a/CORE/MAC/inc/wniApi.h b/CORE/MAC/inc/wniApi.h
index 014b0c4..97d127c 100644
--- a/CORE/MAC/inc/wniApi.h
+++ b/CORE/MAC/inc/wniApi.h
@@ -225,7 +225,6 @@
eWNI_SME_REMAIN_ON_CHANNEL_REQ,
eWNI_SME_REMAIN_ON_CHN_IND,
eWNI_SME_REMAIN_ON_CHN_RSP,
- eWNI_SME_MGMT_FRM_IND,
eWNI_SME_REMAIN_ON_CHN_RDY_IND,
eWNI_SME_SEND_ACTION_FRAME_IND,
eWNI_SME_ACTION_FRAME_SEND_CNF,
@@ -379,6 +378,7 @@
eWNI_SME_NAN_EVENT,
eWNI_SME_SET_TDLS_2040_BSSCOEX_REQ,
eWNI_SME_DEL_ALL_TDLS_PEERS,
+ eWNI_SME_REGISTER_MGMT_FRAME_CB,
eWNI_SME_MSG_TYPES_END
};
diff --git a/CORE/MAC/src/dph/dphHashTable.c b/CORE/MAC/src/dph/dphHashTable.c
index e6d7dc4..161779d 100644
--- a/CORE/MAC/src/dph/dphHashTable.c
+++ b/CORE/MAC/src/dph/dphHashTable.c
@@ -477,7 +477,7 @@
void
dphPrintMacAddr(tpAniSirGlobal pMac, tANI_U8 addr[], tANI_U32 level)
{
- limLog(pMac, (tANI_U16) level, FL("MAC ADDR = %d:%d:%d:%d:%d:%d"),
+ limLog(pMac, (tANI_U16) level, FL("MAC ADDR = %02x:%02x:%02x:%02x:%02x:%02x"),
addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]);
}
diff --git a/CORE/MAC/src/pe/include/limApi.h b/CORE/MAC/src/pe/include/limApi.h
index 51a910f..5b869d3 100644
--- a/CORE/MAC/src/pe/include/limApi.h
+++ b/CORE/MAC/src/pe/include/limApi.h
@@ -127,6 +127,8 @@
extern void limCleanup(tpAniSirGlobal);
/// Function to post messages to LIM thread
extern tANI_U32 limPostMsgApi(tpAniSirGlobal, tSirMsgQ *);
+tANI_U32 limPostMsgApiHighPri(tpAniSirGlobal, tSirMsgQ *);
+
/**
* Function to process messages posted to LIM thread
* and dispatch to various sub modules within LIM module.
diff --git a/CORE/MAC/src/pe/include/limSession.h b/CORE/MAC/src/pe/include/limSession.h
index 36af979..8a94e6c 100644
--- a/CORE/MAC/src/pe/include/limSession.h
+++ b/CORE/MAC/src/pe/include/limSession.h
@@ -359,6 +359,7 @@
tANI_U8 isKeyInstalled;
tANI_BOOLEAN is11Gonly;
tANI_BOOLEAN is_ext_caps_present;
+ tANI_BOOLEAN addBssfailed;
}tPESession, *tpPESession;
#define LIM_MAX_ACTIVE_SESSIONS 4
diff --git a/CORE/MAC/src/pe/lim/limApi.c b/CORE/MAC/src/pe/lim/limApi.c
index 7aba26b..a9abca3 100644
--- a/CORE/MAC/src/pe/lim/limApi.c
+++ b/CORE/MAC/src/pe/lim/limApi.c
@@ -1265,6 +1265,35 @@
} /*** end limPostMsgApi() ***/
+/**
+ * limPostMsgApiHighPri()
+ *
+ * FUNCTION:
+ * This function is called from other thread while posting a
+ * message to LIM message Queue gSirLimMsgQ.
+ *
+ * LOGIC:
+ * NA
+ *
+ * ASSUMPTIONS:
+ * NA
+ *
+ * NOTE:
+ * NA
+ *
+ * @param pMac - Pointer to Global MAC structure
+ * @param pMsg - Pointer to the message structure
+ * @return None
+ */
+
+tANI_U32
+limPostMsgApiHighPri(tpAniSirGlobal pMac, tSirMsgQ *pMsg)
+{
+ return vos_mq_post_message_high_pri(VOS_MQ_ID_PE, (vos_msg_t *) pMsg);
+
+
+} /*** end limPostMsgApi() ***/
+
/*--------------------------------------------------------------------------
diff --git a/CORE/MAC/src/pe/lim/limAssocUtils.c b/CORE/MAC/src/pe/lim/limAssocUtils.c
index e439e90..3bce9f4 100644
--- a/CORE/MAC/src/pe/lim/limAssocUtils.c
+++ b/CORE/MAC/src/pe/lim/limAssocUtils.c
@@ -743,12 +743,15 @@
pMac->lim.gLimNumRxCleanup++;
#endif
- if (psessionEntry->limSmeState == eLIM_SME_JOIN_FAILURE_STATE) {
- retCode = limDelBss( pMac, pStaDs, psessionEntry->bssIdx, psessionEntry);
+ /* Do DEL BSS or DEL STA only if ADD BSS was success */
+ if (!psessionEntry->addBssfailed)
+ {
+ if (psessionEntry->limSmeState == eLIM_SME_JOIN_FAILURE_STATE)
+ retCode = limDelBss( pMac, pStaDs,
+ psessionEntry->bssIdx, psessionEntry);
+ else
+ retCode = limDelSta( pMac, pStaDs, true, psessionEntry);
}
- else
- retCode = limDelSta( pMac, pStaDs, true, psessionEntry);
-
return retCode;
} /*** end limCleanupRxPath() ***/
diff --git a/CORE/MAC/src/pe/lim/limP2P.c b/CORE/MAC/src/pe/lim/limP2P.c
index ecfa883..6952d81 100644
--- a/CORE/MAC/src/pe/lim/limP2P.c
+++ b/CORE/MAC/src/pe/lim/limP2P.c
@@ -745,7 +745,6 @@
tANI_U8 *pRxPacketInfo, tpPESession psessionEntry,
tANI_S8 rxRssi)
{
- tSirMsgQ mmhMsg;
tpSirSmeMgmtFrameInd pSirSmeMgmtFrame = NULL;
tANI_U16 length;
tANI_U8 frameType;
@@ -770,8 +769,7 @@
}
vos_mem_set((void*)pSirSmeMgmtFrame, length, 0);
- pSirSmeMgmtFrame->mesgType = eWNI_SME_MGMT_FRM_IND;
- pSirSmeMgmtFrame->mesgLen = length;
+ pSirSmeMgmtFrame->frameLen = frameLen;
pSirSmeMgmtFrame->sessionId = sessionId;
pSirSmeMgmtFrame->frameType = frameType;
pSirSmeMgmtFrame->rxRssi = rxRssi;
@@ -831,11 +829,14 @@
vos_mem_zero(pSirSmeMgmtFrame->frameBuf, frameLen);
vos_mem_copy(pSirSmeMgmtFrame->frameBuf, frame, frameLen);
- mmhMsg.type = eWNI_SME_MGMT_FRM_IND;
- mmhMsg.bodyptr = pSirSmeMgmtFrame;
- mmhMsg.bodyval = 0;
-
- limSysProcessMmhMsgApi(pMac, &mmhMsg, ePROT);
+ if (pMac->mgmt_frame_ind_cb)
+ pMac->mgmt_frame_ind_cb(pSirSmeMgmtFrame);
+ else
+ {
+ limLog(pMac, LOGW,
+ FL("Management indication callback not registered!!"));
+ }
+ vos_mem_free(pSirSmeMgmtFrame);
return;
} /*** end limSendSmeListenRsp() ***/
diff --git a/CORE/MAC/src/pe/lim/limProcessActionFrame.c b/CORE/MAC/src/pe/lim/limProcessActionFrame.c
index ce2fff9..869b30f 100644
--- a/CORE/MAC/src/pe/lim/limProcessActionFrame.c
+++ b/CORE/MAC/src/pe/lim/limProcessActionFrame.c
@@ -2277,7 +2277,9 @@
__limProcessQosMapConfigureFrame(pMac, (tANI_U8 *) pRxPacketInfo,psessionEntry);
break;
default:
- PELOGE(limLog(pMac, LOGE, FL("Qos action %d not handled"), pActionHdr->actionID);)
+ limLog(pMac, LOG1,
+ FL("Qos action %d not handled"),
+ pActionHdr->actionID);
break;
}
break ;
@@ -2319,7 +2321,9 @@
}
break;
default:
- PELOGE(limLog(pMac, LOGE, FL("Spectrum mgmt action id %d not handled"), pActionHdr->actionID);)
+ limLog(pMac, LOG1,
+ FL("Spectrum mgmt action id %d not handled"),
+ pActionHdr->actionID);
break;
}
break;
@@ -2350,7 +2354,8 @@
break;
default:
- PELOGE(limLog(pMac, LOGE, FL("WME action %d not handled"), pActionHdr->actionID);)
+ limLog(pMac, LOG1, FL("WME action %d not handled"),
+ pActionHdr->actionID);
break;
}
break;
@@ -2387,7 +2392,9 @@
__limProcessSMPowerSaveUpdate(pMac, (tANI_U8 *) pRxPacketInfo,psessionEntry);
break;
default:
- PELOGE(limLog(pMac, LOGE, FL("Action ID %d not handled in HT Action category"), pActionHdr->actionID);)
+ limLog(pMac, LOG1,
+ FL("Action ID %d not handled in HT Action category"),
+ pActionHdr->actionID);
break;
}
break;
@@ -2439,7 +2446,8 @@
__limProcessNeighborReport( pMac, (tANI_U8*) pRxPacketInfo, psessionEntry );
break;
default:
- PELOGE( limLog( pMac, LOGE, FL("Action ID %d not handled in RRM"), pActionHdr->actionID);)
+ limLog( pMac, LOG1, FL("Action ID %d not handled in RRM"),
+ pActionHdr->actionID);
break;
}
@@ -2447,7 +2455,8 @@
else
{
// Else we will just ignore the RRM messages.
- PELOGE( limLog( pMac, LOGE, FL("RRM Action frame ignored as RRM is disabled in cfg"));)
+ limLog( pMac, LOG1,
+ FL("RRM Action frame ignored as RRM is disabled in cfg"));
}
break;
#endif
@@ -2477,13 +2486,14 @@
}
else
{
- limLog( pMac, LOGE, FL("Dropping the vendor specific action frame because of( "
- "WES Mode not enabled (WESMODE = %d) or OUI mismatch (%02x %02x %02x) or "
- "not received with SelfSta Mac address) system role = %d"),
- IS_WES_MODE_ENABLED(pMac),
- pVendorSpecific->Oui[0], pVendorSpecific->Oui[1],
- pVendorSpecific->Oui[2],
- psessionEntry->limSystemRole );
+ limLog( pMac, LOG1,
+ FL("Dropping the vendor specific action frame because of( "
+ "WES Mode not enabled (WESMODE = %d) or OUI mismatch (%02x %02x %02x) or "
+ "not received with SelfSta Mac address) system role = %d"),
+ IS_WES_MODE_ENABLED(pMac),
+ pVendorSpecific->Oui[0], pVendorSpecific->Oui[1],
+ pVendorSpecific->Oui[2],
+ psessionEntry->limSystemRole );
}
}
break;
@@ -2506,8 +2516,10 @@
}
else
{
- limLog( pMac, LOGE, FL("Unhandled public action frame (Vendor specific). OUI %x %x %x %x"),
- pPubAction->Oui[0], pPubAction->Oui[1], pPubAction->Oui[2], pPubAction->Oui[3] );
+ limLog( pMac, LOG1,
+ FL("Unhandled public action frame (Vendor specific). OUI %x %x %x %x"),
+ pPubAction->Oui[0], pPubAction->Oui[1],
+ pPubAction->Oui[2], pPubAction->Oui[3] );
}
}
break;
@@ -2542,7 +2554,8 @@
#endif
default:
- PELOGE(limLog(pMac, LOGE, FL("Unhandled public action frame -- %x "), pActionHdr->actionID);)
+ limLog(pMac, LOG1, FL("Unhandled public action frame -- %x "),
+ pActionHdr->actionID);
break;
}
break;
@@ -2589,7 +2602,8 @@
}
#endif
default:
- PELOGE(limLog(pMac, LOGE, FL("Action category %d not handled"), pActionHdr->category);)
+ limLog(pMac, LOG1,
+ FL("Action category %d not handled"), pActionHdr->category);
break;
}
}
@@ -2639,19 +2653,24 @@
}
else
{
- limLog( pMac, LOGE, FL("Unhandled public action frame (Vendor specific). OUI %x %x %x %x"),
- pActionHdr->Oui[0], pActionHdr->Oui[1], pActionHdr->Oui[2], pActionHdr->Oui[3] );
+ limLog( pMac, LOG1,
+ FL("Unhandled public action frame (Vendor specific). OUI %x %x %x %x"),
+ pActionHdr->Oui[0], pActionHdr->Oui[1],
+ pActionHdr->Oui[2], pActionHdr->Oui[3]);
}
}
break;
default:
- PELOGE(limLog(pMac, LOGE, FL("Unhandled public action frame -- %x "), pActionHdr->actionID);)
+ limLog(pMac, LOG1,
+ FL("Unhandled public action frame -- %x "), pActionHdr->actionID);
break;
}
break;
default:
- PELOGE(limLog(pMac, LOG1, FL("Unhandled action frame without session -- %x "), pActionHdr->category);)
- break;
+ limLog(pMac, LOG1,
+ FL("Unhandled action frame without session -- %x "),
+ pActionHdr->category);
+ break;
}
}
diff --git a/CORE/MAC/src/pe/lim/limProcessMessageQueue.c b/CORE/MAC/src/pe/lim/limProcessMessageQueue.c
index ebb2e1b..62c1b81 100644
--- a/CORE/MAC/src/pe/lim/limProcessMessageQueue.c
+++ b/CORE/MAC/src/pe/lim/limProcessMessageQueue.c
@@ -80,7 +80,7 @@
#include "vos_memory.h"
/* This value corresponds to 500 ms */
-#define MAX_PROBEREQ_TIME 5000
+#define MAX_PROBEREQ_TIME 50
#ifdef WLAN_FEATURE_EXTSCAN
#define SIZE_OF_FIXED_PARAM 12
@@ -1565,6 +1565,7 @@
case eWNI_SME_GET_TSM_STATS_REQ:
#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */
case eWNI_SME_MAC_SPOOF_ADDR_IND:
+ case eWNI_SME_REGISTER_MGMT_FRAME_CB:
// These messages are from HDD
limProcessNormalHddMsg(pMac, limMsg, false); //no need to response to hdd
break;
diff --git a/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c b/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c
index 9756c1c..d1316b2 100644
--- a/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c
+++ b/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c
@@ -1826,12 +1826,20 @@
pStaDs->mlmStaContext.protStatusCode = protStatusCode;
//Done: 7-27-2009. JIM_FIX_ME: at the end of limCleanupRxPath, make sure PE is sending eWNI_SME_JOIN_RSP to SME
limCleanupRxPath(pMac, pStaDs, psessionEntry);
+ /* Cleanup if add bss failed */
+ if(psessionEntry->addBssfailed)
+ {
+ dphDeleteHashEntry(pMac, pStaDs->staAddr, pStaDs->assocId,
+ &psessionEntry->dph.dphHashTable);
+ goto error;
+ }
vos_mem_free(psessionEntry->pLimJoinReq);
psessionEntry->pLimJoinReq = NULL;
return;
}
}
+error:
vos_mem_free(psessionEntry->pLimJoinReq);
psessionEntry->pLimJoinReq = NULL;
//Delete teh session if JOIN failure occurred.
@@ -1895,10 +1903,17 @@
pStaDs->mlmStaContext.resultCode = resultCode;
pStaDs->mlmStaContext.protStatusCode = protStatusCode;
limCleanupRxPath(pMac, pStaDs, psessionEntry);
+ /* Cleanup if add bss failed */
+ if(psessionEntry->addBssfailed)
+ {
+ dphDeleteHashEntry(pMac, pStaDs->staAddr, pStaDs->assocId,
+ &psessionEntry->dph.dphHashTable);
+ goto error;
+ }
return;
}
}
-
+error:
//Delete teh session if REASSOC failure occurred.
if(resultCode != eSIR_SME_SUCCESS)
{
@@ -3271,6 +3286,7 @@
mlmAssocCnf.resultCode = (tSirResultCodes) eSIR_SME_FT_REASSOC_FAILURE;
else
mlmAssocCnf.resultCode = (tSirResultCodes) eSIR_SME_REFUSED;
+ psessionEntry->addBssfailed = true;
}
if(mlmAssocCnf.resultCode != eSIR_SME_SUCCESS)
diff --git a/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c b/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
index 09d1105..aa98b10 100644
--- a/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
+++ b/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
@@ -5475,6 +5475,35 @@
}
/**
+ * lim_register_mgmt_frame_ind_cb() - Save the Management frame
+ * indication callback in PE.
+ * @pMac: Mac pointer
+ * @pMsgBuf: Msg pointer containing the callback
+ *
+ * This function is used save the Management frame
+ * indication callback in PE.
+ *
+ * Return: None
+ */
+static void lim_register_mgmt_frame_ind_cb(tpAniSirGlobal pMac,
+ tANI_U32 *msg_buf)
+{
+ struct sir_sme_mgmt_frame_cb_req *sme_req =
+ (struct sir_sme_mgmt_frame_cb_req *)msg_buf;
+
+ if (NULL == msg_buf)
+ {
+ limLog(pMac, LOGE, FL("msg_buf is null"));
+ return;
+ }
+ if (sme_req->callback)
+ pMac->mgmt_frame_ind_cb =
+ (sir_mgmt_frame_ind_callback)sme_req->callback;
+ else
+ limLog(pMac, LOGE, FL("sme_req->callback is null"));
+}
+
+/**
* limProcessSmeReqMessages()
*
*FUNCTION:
@@ -5807,7 +5836,9 @@
case eWNI_SME_MAC_SPOOF_ADDR_IND:
__limProcessSmeSpoofMacAddrRequest(pMac, pMsgBuf);
break ;
-
+ case eWNI_SME_REGISTER_MGMT_FRAME_CB:
+ lim_register_mgmt_frame_ind_cb(pMac, pMsgBuf);
+ break;
default:
vos_mem_free((v_VOID_t*)pMsg->bodyptr);
pMsg->bodyptr = NULL;
diff --git a/CORE/MAC/src/pe/lim/limTimerUtils.c b/CORE/MAC/src/pe/lim/limTimerUtils.c
index c007fa3..0ff5c44 100644
--- a/CORE/MAC/src/pe/lim/limTimerUtils.c
+++ b/CORE/MAC/src/pe/lim/limTimerUtils.c
@@ -40,7 +40,7 @@
#include "limAssocUtils.h"
#include "limSecurityUtils.h"
#include "pmmApi.h"
-
+#include "limApi.h"
// default value 5000 ms for background scan period when it is disabled
#define LIM_BACKGROUND_SCAN_PERIOD_DEFAULT_MS 5000
@@ -774,7 +774,7 @@
msg.bodyptr = NULL;
msg.bodyval = 0;
- if ((statusCode = limPostMsgApi(pMac, &msg)) != eSIR_SUCCESS)
+ if ((statusCode = limPostMsgApiHighPri(pMac, &msg)) != eSIR_SUCCESS)
limLog(pMac, LOGE,
FL("posting message %X to LIM failed, reason=%d"),
msg.type, statusCode);
diff --git a/CORE/SAP/inc/sapApi.h b/CORE/SAP/inc/sapApi.h
index f8d1bec..32bde8f 100644
--- a/CORE/SAP/inc/sapApi.h
+++ b/CORE/SAP/inc/sapApi.h
@@ -187,7 +187,6 @@
eSAP_ASSOC_STA_CALLBACK_EVENT, /*Event sent when user called WLANSAP_GetAssocStations */
eSAP_GET_WPSPBC_SESSION_EVENT, /* Event send when user call WLANSAP_getWpsSessionOverlap */
eSAP_WPS_PBC_PROBE_REQ_EVENT, /* Event send on WPS PBC probe request is received */
- eSAP_INDICATE_MGMT_FRAME,
eSAP_REMAIN_CHAN_READY,
eSAP_SEND_ACTION_CNF,
eSAP_DISCONNECT_ALL_P2P_CLIENT,
@@ -394,7 +393,6 @@
tSap_AssocStaListEvent sapAssocStaListEvent; /*SAP_ASSOC_STA_CALLBACK_EVENT */
tSap_GetWPSPBCSessionEvent sapGetWPSPBCSessionEvent; /*SAP_GET_WPSPBC_SESSION_EVENT */
tSap_WPSPBCProbeReqEvent sapPBCProbeReqEvent; /*eSAP_WPS_PBC_PROBE_REQ_EVENT */
- tSap_ManagementFrameInfo sapManagementFrameInfo; /*eSAP_INDICATE_MGMT_FRAME*/
tSap_SendActionCnf sapActionCnf; /* eSAP_SEND_ACTION_CNF */
tSap_UnknownSTAJoinEvent sapUnknownSTAJoin; /* eSAP_UNKNOWN_STA_JOIN */
tSap_MaxAssocExceededEvent sapMaxAssocExceeded; /* eSAP_MAX_ASSOC_EXCEEDED */
diff --git a/CORE/SAP/src/sapApiLinkCntl.c b/CORE/SAP/src/sapApiLinkCntl.c
index d51daba..631df4d 100644
--- a/CORE/SAP/src/sapApiLinkCntl.c
+++ b/CORE/SAP/src/sapApiLinkCntl.c
@@ -1269,15 +1269,6 @@
FL("CSR roamStatus = %s (%d)"),
"eCSR_ROAM_WPS_PBC_PROBE_REQ_IND", roamStatus);
break;
-
- case eCSR_ROAM_INDICATE_MGMT_FRAME:
- VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
- FL("CSR roamStatus = %s (%d)"),
- "eCSR_ROAM_INDICATE_MGMT_FRAME", roamStatus);
- sapSignalHDDevent(sapContext, pCsrRoamInfo,
- eSAP_INDICATE_MGMT_FRAME,
- (v_PVOID_t) eSAP_STATUS_SUCCESS);
- break;
case eCSR_ROAM_REMAIN_CHAN_READY:
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
FL("CSR roamStatus = %s (%d)"),
diff --git a/CORE/SAP/src/sapFsm.c b/CORE/SAP/src/sapFsm.c
index 98c0aac..6381bb1 100644
--- a/CORE/SAP/src/sapFsm.c
+++ b/CORE/SAP/src/sapFsm.c
@@ -904,22 +904,6 @@
pCsrRoamInfo->u.pWPSPBCProbeReq,
sizeof(tSirWPSPBCProbeReq));
break;
-
- case eSAP_INDICATE_MGMT_FRAME:
- VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
- FL("SAP event callback event = %s"),
- "eSAP_INDICATE_MGMT_FRAME");
- sapApAppEvent.sapHddEventCode = eSAP_INDICATE_MGMT_FRAME;
- sapApAppEvent.sapevt.sapManagementFrameInfo.nFrameLength
- = pCsrRoamInfo->nFrameLength;
- sapApAppEvent.sapevt.sapManagementFrameInfo.pbFrames
- = pCsrRoamInfo->pbFrames;
- sapApAppEvent.sapevt.sapManagementFrameInfo.frameType
- = pCsrRoamInfo->frameType;
- sapApAppEvent.sapevt.sapManagementFrameInfo.rxChan
- = pCsrRoamInfo->rxChan;
-
- break;
case eSAP_REMAIN_CHAN_READY:
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
FL("SAP event callback event = %s"),
diff --git a/CORE/SME/inc/csrApi.h b/CORE/SME/inc/csrApi.h
index 490e16c..c2320b1 100644
--- a/CORE/SME/inc/csrApi.h
+++ b/CORE/SME/inc/csrApi.h
@@ -474,7 +474,6 @@
eCSR_ROAM_FT_RESPONSE,
#endif
eCSR_ROAM_FT_START,
- eCSR_ROAM_INDICATE_MGMT_FRAME,
eCSR_ROAM_REMAIN_CHAN_READY,
eCSR_ROAM_SEND_ACTION_CNF,
//this mean error happens before association_start or roaming_start is called.
diff --git a/CORE/SME/inc/smeInside.h b/CORE/SME/inc/smeInside.h
index bdaffb8..ba70201 100644
--- a/CORE/SME/inc/smeInside.h
+++ b/CORE/SME/inc/smeInside.h
@@ -303,8 +303,20 @@
tANI_U8 sessionId,
tSirMacAddr peerMac,
tCsrTdlsLinkEstablishParams *tdlsLinkEstablishParams);
-eHalStatus csrTdlsAddPeerSta(tHalHandle hHal, tANI_U8 sessionId, tSirMacAddr peerMac);
-eHalStatus csrTdlsChangePeerSta(tHalHandle hHal, tANI_U8 sessionId, tSirMacAddr peerMac, tCsrStaParams *pstaParams);
+eHalStatus csrTdlsAddPeerSta(tHalHandle hHal, tANI_U8 sessionId,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0))
+ const tSirMacAddr peerMac
+#else
+ tSirMacAddr peerMac
+#endif
+ );
+eHalStatus csrTdlsChangePeerSta(tHalHandle hHal, tANI_U8 sessionId,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0))
+ const tSirMacAddr peerMac,
+#else
+ tSirMacAddr peerMac,
+#endif
+ tCsrStaParams *pstaParams);
eHalStatus csrTdlsDelPeerSta(tHalHandle hHal, tANI_U8 sessionId, tSirMacAddr peerMac);
eHalStatus csrTdlsProcessCmd(tpAniSirGlobal pMac,tSmeCmd *pCommand );
eHalStatus csrTdlsProcessLinkEstablish( tpAniSirGlobal pMac, tSmeCmd *cmd );
diff --git a/CORE/SME/inc/sme_Api.h b/CORE/SME/inc/sme_Api.h
index 564aedb..18ba17b 100644
--- a/CORE/SME/inc/sme_Api.h
+++ b/CORE/SME/inc/sme_Api.h
@@ -46,6 +46,7 @@
/*--------------------------------------------------------------------------
Include Files
------------------------------------------------------------------------*/
+#include <linux/version.h>
#include "ccmApi.h"
#include "csrApi.h"
#include "pmcApi.h"
@@ -2156,6 +2157,9 @@
-------------------------------------------------------------------------------*/
eHalStatus sme_GetOperationChannel(tHalHandle hHal, tANI_U32 *pChannel, tANI_U8 sessionId);
+eHalStatus sme_register_mgmt_frame_ind_callback(tHalHandle hHal,
+ sir_mgmt_frame_ind_callback callback);
+
/* ---------------------------------------------------------------------------
\fn sme_RegisterMgtFrame
@@ -3270,7 +3274,12 @@
\param staParams - Peer Station Parameters.
\- return VOS_STATUS_SUCCES
-------------------------------------------------------------------------*/
-VOS_STATUS sme_ChangeTdlsPeerSta(tHalHandle hHal, tANI_U8 sessionId, tSirMacAddr peerMac,
+VOS_STATUS sme_ChangeTdlsPeerSta(tHalHandle hHal, tANI_U8 sessionId,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0))
+ const tSirMacAddr peerMac,
+#else
+ tSirMacAddr peerMac,
+#endif
tCsrStaParams *pstaParams);
/* ---------------------------------------------------------------------------
\fn sme_AddTdlsPeerSta
@@ -3279,7 +3288,13 @@
\param peerMac - peer's Mac Adress.
\- return VOS_STATUS_SUCCES
-------------------------------------------------------------------------*/
-VOS_STATUS sme_AddTdlsPeerSta(tHalHandle hHal, tANI_U8 sessionId, tSirMacAddr peerMac);
+VOS_STATUS sme_AddTdlsPeerSta(tHalHandle hHal, tANI_U8 sessionId,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0))
+ const tSirMacAddr peerMac
+#else
+ tSirMacAddr peerMac
+#endif
+ );
/* ---------------------------------------------------------------------------
\fn sme_DeleteTdlsPeerSta
\brief API to Delete TDLS peer sta entry.
@@ -3500,7 +3515,11 @@
tANI_U8 channel);
eHalStatus sme_RoamDelPMKIDfromCache( tHalHandle hHal, tANI_U8 sessionId,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0))
+ const tANI_U8 *pBSSId,
+#else
tANI_U8 *pBSSId,
+#endif
tANI_BOOLEAN flush_cache );
void smeGetCommandQStatus( tHalHandle hHal );
diff --git a/CORE/SME/src/csr/csrApiRoam.c b/CORE/SME/src/csr/csrApiRoam.c
index fb5a300..e6f5dc9 100644
--- a/CORE/SME/src/csr/csrApiRoam.c
+++ b/CORE/SME/src/csr/csrApiRoam.c
@@ -6740,6 +6740,11 @@
smsLog(pMac, LOGP, FL("No profile specified"));
return eHAL_STATUS_FAILURE;
}
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return eHAL_STATUS_FAILURE;
+ }
smsLog(pMac, LOG1, FL("called BSSType = %s (%d) authtype = %d "
"encryType = %d"),
lim_BssTypetoString(pProfile->BSSType),
@@ -6753,6 +6758,8 @@
pProfile->operationChannel);
return status;
}
+ /* Reset abortConnection for the fresh connection */
+ pSession->abortConnection = FALSE;
csrRoamCancelRoaming(pMac, sessionId);
csrScanRemoveFreshScanCommand(pMac, sessionId);
csrScanCancelIdleScan(pMac);
@@ -7256,7 +7263,7 @@
{
eHalStatus status = eHAL_STATUS_SUCCESS;
tSmeCmd *pCommand;
- tANI_BOOLEAN fHighPriority = eANI_BOOLEAN_FALSE;
+
do
{
pCommand = csrGetCommandBuffer( pMac );
@@ -7285,7 +7292,6 @@
pCommand->u.roamCmd.roamReason = eCsrForcedDeauth;
break;
case eCSR_DISCONNECT_REASON_HANDOFF:
- fHighPriority = eANI_BOOLEAN_TRUE;
pCommand->u.roamCmd.roamReason = eCsrSmeIssuedDisassocForHandoff;
break;
case eCSR_DISCONNECT_REASON_UNSPECIFIED:
@@ -7301,7 +7307,7 @@
default:
break;
}
- status = csrQueueSmeCommand(pMac, pCommand, fHighPriority);
+ status = csrQueueSmeCommand(pMac, pCommand, eANI_BOOLEAN_TRUE);
if( !HAL_STATUS_SUCCESS( status ) )
{
smsLog( pMac, LOGE, FL(" fail to send message status = %d"), status );
@@ -12481,7 +12487,11 @@
}
eHalStatus csrRoamDelPMKIDfromCache( tpAniSirGlobal pMac, tANI_U32 sessionId,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0))
+ const tANI_U8 *pBSSId,
+#else
tANI_U8 *pBSSId,
+#endif
tANI_BOOLEAN flush_cache )
{
tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
@@ -15359,6 +15369,8 @@
{
tAniGetPEStatsReq *pMsg;
eHalStatus status = eHAL_STATUS_SUCCESS;
+ tSirMsgQ msgQ;
+
pMsg = vos_mem_malloc(sizeof(tAniGetPEStatsReq));
if ( NULL == pMsg )
{
@@ -15366,14 +15378,20 @@
return eHAL_STATUS_FAILURE;
}
// need to initiate a stats request to PE
- pMsg->msgType = pal_cpu_to_be16((tANI_U16)eWNI_SME_GET_STATISTICS_REQ);
+ pMsg->msgType = pal_cpu_to_be16((tANI_U16)WDA_GET_STATISTICS_REQ);
pMsg->msgLen = (tANI_U16)sizeof(tAniGetPEStatsReq);
pMsg->staId = staId;
pMsg->statsMask = statsMask;
- status = palSendMBMessage(pMac->hHdd, pMsg );
+
+ msgQ.type = WDA_GET_STATISTICS_REQ;
+ msgQ.reserved = 0;
+ msgQ.bodyptr = pMsg;
+ msgQ.bodyval = 0;
+ status = wdaPostCtrlMsg(pMac, &msgQ);
if(!HAL_STATUS_SUCCESS(status))
{
smsLog(pMac, LOG1, FL("Failed to send down the stats req "));
+ vos_mem_free(pMsg);
}
return status;
}
@@ -16420,7 +16438,7 @@
tCsrRoamSession *pSession;
tANI_U8 i,j,num_channels = 0, ucDot11Mode;
tANI_U8 *ChannelList = NULL;
- tANI_U32 sessionId;
+ tANI_U32 sessionId = 0;
eHalStatus status = eHAL_STATUS_SUCCESS;
tpCsrChannelInfo currChannelListInfo;
tANI_U32 host_channels = 0;
@@ -16475,12 +16493,11 @@
* the roam scan. So no need to find the session if command is
* ROAM_SCAN_OFFLOAD_STOP.
*/
+ status = csrRoamGetSessionIdFromBSSID(pMac,
+ (tCsrBssid *)pNeighborRoamInfo->currAPbssid,
+ &sessionId);
if( ROAM_SCAN_OFFLOAD_STOP != command )
{
- status = csrRoamGetSessionIdFromBSSID(pMac,
- (tCsrBssid *)pNeighborRoamInfo->currAPbssid,
- &sessionId);
-
if ( !HAL_STATUS_SUCCESS( status ) )
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
diff --git a/CORE/SME/src/csr/csrInsideApi.h b/CORE/SME/src/csr/csrInsideApi.h
index 74471c1..0a81326 100644
--- a/CORE/SME/src/csr/csrInsideApi.h
+++ b/CORE/SME/src/csr/csrInsideApi.h
@@ -37,6 +37,7 @@
#define CSR_INSIDE_API_H__
+#include <linux/version.h>
#include "csrSupport.h"
#include "smeInside.h"
#include "vos_nvitem.h"
@@ -1026,7 +1027,12 @@
eHalStatus csrUpdateChannelList(tpAniSirGlobal pMac);
eHalStatus csrRoamDelPMKIDfromCache( tpAniSirGlobal pMac, tANI_U32 sessionId,
- tANI_U8 *pBSSId, tANI_BOOLEAN flush_cache );
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0))
+ const tANI_U8 *pBSSId,
+#else
+ tANI_U8 *pBSSId,
+#endif
+ tANI_BOOLEAN flush_cache );
tANI_BOOLEAN csrElectedCountryInfo(tpAniSirGlobal pMac);
void csrAddVoteForCountryInfo(tpAniSirGlobal pMac, tANI_U8 *pCountryCode);
void csrClearVotesForCountryInfo(tpAniSirGlobal pMac);
diff --git a/CORE/SME/src/csr/csrNeighborRoam.c b/CORE/SME/src/csr/csrNeighborRoam.c
index c5cdba5..19bd0de 100644
--- a/CORE/SME/src/csr/csrNeighborRoam.c
+++ b/CORE/SME/src/csr/csrNeighborRoam.c
@@ -1076,7 +1076,7 @@
VOS_STATUS vosStatus = VOS_STATUS_SUCCESS;
eHalStatus preauthProcessed = eHAL_STATUS_SUCCESS;
tpCsrNeighborRoamBSSInfo pPreauthRspNode = NULL;
-
+ tCsrRoamSession *pSession;
#ifdef FEATURE_WLAN_LFR_METRICS
tCsrRoamInfo *roamInfo;
#endif
@@ -1204,11 +1204,18 @@
csrNeighborRoamFreeNeighborRoamBSSNode(pMac, pNeighborBssNode);
}
}
+ pSession = CSR_GET_SESSION(pMac, pNeighborRoamInfo->csrSessionId);
+ if ((NULL != pSession) && pSession->abortConnection)
+ {
+ smsLog(pMac, LOGE, FL(" Deauth in progress Abort preauth"));
+ goto abort_preauth;
+ }
/* Issue preauth request for the same/next entry */
if (eHAL_STATUS_SUCCESS == csrNeighborRoamIssuePreauthReq(pMac))
goto DEQ_PREAUTH;
+abort_preauth:
#ifdef WLAN_FEATURE_ROAM_SCAN_OFFLOAD
if (csrRoamIsRoamOffloadScanEnabled(pMac))
{
diff --git a/CORE/SME/src/csr/csrTdlsProcess.c b/CORE/SME/src/csr/csrTdlsProcess.c
index 3ec86c7..e78e716 100644
--- a/CORE/SME/src/csr/csrTdlsProcess.c
+++ b/CORE/SME/src/csr/csrTdlsProcess.c
@@ -155,7 +155,12 @@
/*
* TDLS request API, called from HDD to modify an existing TDLS peer
*/
-eHalStatus csrTdlsChangePeerSta(tHalHandle hHal, tANI_U8 sessionId, tSirMacAddr peerMac,
+eHalStatus csrTdlsChangePeerSta(tHalHandle hHal, tANI_U8 sessionId,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0))
+ const tSirMacAddr peerMac,
+#else
+ tSirMacAddr peerMac,
+#endif
tCsrStaParams *pstaParams)
{
tpAniSirGlobal pMac = PMAC_STRUCT( hHal );
@@ -289,7 +294,13 @@
/*
* TDLS request API, called from HDD to add a TDLS peer
*/
-eHalStatus csrTdlsAddPeerSta(tHalHandle hHal, tANI_U8 sessionId, tSirMacAddr peerMac)
+eHalStatus csrTdlsAddPeerSta(tHalHandle hHal, tANI_U8 sessionId,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0))
+ const tSirMacAddr peerMac
+#else
+ tSirMacAddr peerMac
+#endif
+ )
{
tpAniSirGlobal pMac = PMAC_STRUCT( hHal );
tSmeCmd *tdlsAddStaCmd ;
diff --git a/CORE/SME/src/csr/csrUtil.c b/CORE/SME/src/csr/csrUtil.c
index 052d863..3e2732f 100644
--- a/CORE/SME/src/csr/csrUtil.c
+++ b/CORE/SME/src/csr/csrUtil.c
@@ -1268,7 +1268,6 @@
CASE_RETURN_STR(eCSR_ROAM_FT_RESPONSE);
#endif
CASE_RETURN_STR(eCSR_ROAM_FT_START);
- CASE_RETURN_STR(eCSR_ROAM_INDICATE_MGMT_FRAME);
CASE_RETURN_STR(eCSR_ROAM_REMAIN_CHAN_READY);
CASE_RETURN_STR(eCSR_ROAM_SEND_ACTION_CNF);
CASE_RETURN_STR(eCSR_ROAM_SESSION_OPENED);
diff --git a/CORE/SME/src/p2p/p2p_Api.c b/CORE/SME/src/p2p/p2p_Api.c
index 020d1c8..58bb906 100644
--- a/CORE/SME/src/p2p/p2p_Api.c
+++ b/CORE/SME/src/p2p/p2p_Api.c
@@ -216,60 +216,6 @@
return status;
}
-
-/*------------------------------------------------------------------
- *
- * Handle the Mgmt frm ind from LIM and forward to HDD.
- *
- *------------------------------------------------------------------*/
-
-eHalStatus sme_mgmtFrmInd( tHalHandle hHal, tpSirSmeMgmtFrameInd pSmeMgmtFrm)
-{
- tpAniSirGlobal pMac = PMAC_STRUCT( hHal );
- eHalStatus status = eHAL_STATUS_SUCCESS;
- tCsrRoamInfo pRoamInfo = {0};
-#ifndef WLAN_FEATURE_P2P_INTERNAL
- tANI_U32 SessionId = pSmeMgmtFrm->sessionId;
-#endif
-
-#ifdef WLAN_FEATURE_P2P_INTERNAL
- tANI_U8 i;
-
- //For now, only action frames are needed.
- if(SIR_MAC_MGMT_ACTION == pSmeMgmtFrm->frameType)
- {
- pRoamInfo.nFrameLength = pSmeMgmtFrm->mesgLen - sizeof(tSirSmeMgmtFrameInd);
- pRoamInfo.pbFrames = pSmeMgmtFrm->frameBuf;
- pRoamInfo.frameType = pSmeMgmtFrm->frameType;
- pRoamInfo.rxChan = pSmeMgmtFrm->rxChan;
- pRoamInfo.rxRssi = pSmeMgmtFrm->rxRssi;
-
- //Somehow we don't get the right sessionId.
- for(i = 0; i < CSR_ROAM_SESSION_MAX; i++)
- {
- if( CSR_IS_SESSION_VALID( pMac, i ) )
- {
- status = eHAL_STATUS_SUCCESS;
- /* forward the mgmt frame to all active sessions*/
- csrRoamCallCallback(pMac, i, &pRoamInfo, 0, eCSR_ROAM_INDICATE_MGMT_FRAME, 0);
- }
- }
- }
-#else
- pRoamInfo.nFrameLength = pSmeMgmtFrm->mesgLen - sizeof(tSirSmeMgmtFrameInd);
- pRoamInfo.pbFrames = pSmeMgmtFrm->frameBuf;
- pRoamInfo.frameType = pSmeMgmtFrm->frameType;
- pRoamInfo.rxChan = pSmeMgmtFrm->rxChan;
- pRoamInfo.rxRssi = pSmeMgmtFrm->rxRssi;
-
- /* forward the mgmt frame to HDD */
- csrRoamCallCallback(pMac, SessionId, &pRoamInfo, 0, eCSR_ROAM_INDICATE_MGMT_FRAME, 0);
-#endif
-
- return status;
-}
-
-
/*------------------------------------------------------------------
*
* Handle the remain on channel ready indication from PE
diff --git a/CORE/SME/src/pmc/pmcApi.c b/CORE/SME/src/pmc/pmcApi.c
index 8499506..160c991 100644
--- a/CORE/SME/src/pmc/pmcApi.c
+++ b/CORE/SME/src/pmc/pmcApi.c
@@ -2203,12 +2203,18 @@
if(pattern == NULL)
{
pmcLog(pMac, LOGE, FL("Null broadcast pattern being passed"));
+#ifdef FEATURE_WLAN_DIAG_SUPPORT
+ WLAN_VOS_DIAG_LOG_FREE(log_ptr);
+#endif
return eHAL_STATUS_FAILURE;
}
if( pSession == NULL)
{
pmcLog(pMac, LOGE, FL("Session not found "));
+#ifdef FEATURE_WLAN_DIAG_SUPPORT
+ WLAN_VOS_DIAG_LOG_FREE(log_ptr);
+#endif
return eHAL_STATUS_FAILURE;
}
@@ -3088,7 +3094,8 @@
pCommand->command = eSmeCommandPnoReq;
pCommand->sessionId = (tANI_U8)sessionId;
- if (!HAL_STATUS_SUCCESS(csrQueueSmeCommand(pMac, pCommand, TRUE)))
+ if (!HAL_STATUS_SUCCESS(csrQueueSmeCommand(pMac, pCommand,
+ !pRequestBuf->enable)))
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
FL("failed to post eSmeCommandPnoReq command"));
diff --git a/CORE/SME/src/sme_common/sme_Api.c b/CORE/SME/src/sme_common/sme_Api.c
index b341b54..92f7b11 100644
--- a/CORE/SME/src/sme_common/sme_Api.c
+++ b/CORE/SME/src/sme_common/sme_Api.c
@@ -92,7 +92,6 @@
extern void csrReleaseRocReqCommand( tpAniSirGlobal pMac);
extern eHalStatus p2pProcessRemainOnChannelCmd(tpAniSirGlobal pMac, tSmeCmd *p2pRemainonChn);
extern eHalStatus sme_remainOnChnRsp( tpAniSirGlobal pMac, tANI_U8 *pMsg);
-extern eHalStatus sme_mgmtFrmInd( tHalHandle hHal, tpSirSmeMgmtFrameInd pSmeMgmtFrm);
extern eHalStatus sme_remainOnChnReady( tHalHandle hHal, tANI_U8* pMsg);
extern eHalStatus sme_sendActionCnf( tHalHandle hHal, tANI_U8* pMsg);
extern eHalStatus p2pProcessNoAReq(tpAniSirGlobal pMac, tSmeCmd *pNoACmd);
@@ -2280,17 +2279,6 @@
smsLog( pMac, LOGE, "Empty rsp message for meas (eWNI_SME_REMAIN_ON_CHN_RDY_IND), nothing to process");
}
break;
- case eWNI_SME_MGMT_FRM_IND:
- if(pMsg->bodyptr)
- {
- sme_mgmtFrmInd(pMac, pMsg->bodyptr);
- vos_mem_free(pMsg->bodyptr);
- }
- else
- {
- smsLog( pMac, LOGE, "Empty rsp message for meas (eWNI_SME_MGMT_FRM_IND), nothing to process");
- }
- break;
#ifdef WLAN_FEATURE_AP_HT40_24G
case eWNI_SME_2040_COEX_IND:
if(pMsg->bodyptr)
@@ -3928,7 +3916,11 @@
}
eHalStatus sme_RoamDelPMKIDfromCache( tHalHandle hHal, tANI_U8 sessionId,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0))
+ const tANI_U8 *pBSSId,
+#else
tANI_U8 *pBSSId,
+#endif
tANI_BOOLEAN flush_cache )
{
eHalStatus status = eHAL_STATUS_FAILURE;
@@ -7255,6 +7247,48 @@
return eHAL_STATUS_FAILURE;
}// sme_GetOperationChannel ends here
+/**
+ * sme_register_mgmt_frame_ind_callback() - Register a callback for
+ * management frame indication to PE.
+ * @hHal: hal pointer
+ * @callback: callback pointer to be registered
+ *
+ * This function is used to register a callback for management
+ * frame indication to PE.
+ *
+ * Return: Success if msg is posted to PE else Failure.
+ */
+eHalStatus sme_register_mgmt_frame_ind_callback(tHalHandle hHal,
+ sir_mgmt_frame_ind_callback callback)
+{
+ tpAniSirGlobal pMac = PMAC_STRUCT( hHal );
+ struct sir_sme_mgmt_frame_cb_req *msg;
+ eHalStatus status = eHAL_STATUS_SUCCESS;
+
+ smsLog(pMac, LOG1, FL(": ENTER"));
+
+ if (eHAL_STATUS_SUCCESS == sme_AcquireGlobalLock(&pMac->sme))
+ {
+ msg = vos_mem_malloc(sizeof(*msg));
+ if (NULL == msg)
+ {
+ smsLog(pMac, LOGE,
+ FL("Not able to allocate memory for eWNI_SME_REGISTER_MGMT_FRAME_CB"));
+ sme_ReleaseGlobalLock( &pMac->sme );
+ return eHAL_STATUS_FAILURE;
+ }
+ vos_mem_set(msg, sizeof(*msg), 0);
+ msg->message_type = eWNI_SME_REGISTER_MGMT_FRAME_CB;
+ msg->length = sizeof(*msg);
+
+ msg->callback = callback;
+ status = palSendMBMessage(pMac->hHdd, msg);
+ sme_ReleaseGlobalLock( &pMac->sme );
+ return status;
+ }
+ return eHAL_STATUS_FAILURE;
+}
+
/* ---------------------------------------------------------------------------
\fn sme_RegisterMgtFrame
@@ -10637,7 +10671,12 @@
\param staParams - Peer Station Parameters
\- return VOS_STATUS_SUCCES
-------------------------------------------------------------------------*/
-VOS_STATUS sme_ChangeTdlsPeerSta(tHalHandle hHal, tANI_U8 sessionId, tSirMacAddr peerMac,
+VOS_STATUS sme_ChangeTdlsPeerSta(tHalHandle hHal, tANI_U8 sessionId,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0))
+ const tSirMacAddr peerMac,
+#else
+ tSirMacAddr peerMac,
+#endif
tCsrStaParams *pstaParams)
{
eHalStatus status = eHAL_STATUS_SUCCESS;
@@ -10656,7 +10695,7 @@
status = sme_AcquireGlobalLock( &pMac->sme );
if ( HAL_STATUS_SUCCESS( status ) )
{
- status = csrTdlsChangePeerSta(hHal, sessionId, peerMac,pstaParams);
+ status = csrTdlsChangePeerSta(hHal, sessionId, peerMac, pstaParams);
sme_ReleaseGlobalLock( &pMac->sme );
}
@@ -10672,7 +10711,13 @@
\param peerMac - peer's Mac Adress.
\- return VOS_STATUS_SUCCES
-------------------------------------------------------------------------*/
-VOS_STATUS sme_AddTdlsPeerSta(tHalHandle hHal, tANI_U8 sessionId, tSirMacAddr peerMac)
+VOS_STATUS sme_AddTdlsPeerSta(tHalHandle hHal, tANI_U8 sessionId,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0))
+ const tSirMacAddr peerMac
+#else
+ tSirMacAddr peerMac
+#endif
+ )
{
eHalStatus status = eHAL_STATUS_SUCCESS;
tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
diff --git a/CORE/SVC/external/wlan_nlink_common.h b/CORE/SVC/external/wlan_nlink_common.h
index 7baa885..4bd5698 100644
--- a/CORE/SVC/external/wlan_nlink_common.h
+++ b/CORE/SVC/external/wlan_nlink_common.h
@@ -39,7 +39,7 @@
#define WLAN_NLINK_COMMON_H__
#include <linux/netlink.h>
-
+#include <linux/if.h>
/*---------------------------------------------------------------------------
* External Functions
*-------------------------------------------------------------------------*/
@@ -85,6 +85,8 @@
// Special Message Type used by SoftAP, intercepted by send_btc_nlink_msg() and
// replaced by WLAN_STA_ASSOC_DONE_IND
#define WLAN_BTC_SOFTAP_BSS_START 0x11
+#define WLAN_MSG_RPS_ENABLE_IND 0x10A
+#define WLAN_SVC_IFACE_NUM_QUEUES 6
#define WLAN_SVC_SAP_RESTART_IND 0x108
// Event data for WLAN_BTC_QUERY_STATE_RSP & WLAN_STA_ASSOC_DONE_IND
@@ -99,14 +101,20 @@
ANI_NL_MSG_PUMAC = ANI_NL_MSG_BASE + 0x01,// PTT Socket App
ANI_NL_MSG_PTT = ANI_NL_MSG_BASE + 0x07,// Quarky GUI
WLAN_NL_MSG_BTC,
+ WLAN_NL_MSG_SVC = ANI_NL_MSG_BASE + 0x0A,
ANI_NL_MSG_LOG = ANI_NL_MSG_BASE + 0x0C,
- WLAN_NL_MSG_SVC,
ANI_NL_MSG_MAX
} tAniNlModTypes, tWlanNlModTypes;
#define WLAN_NL_MSG_BASE ANI_NL_MSG_BASE
#define WLAN_NL_MSG_MAX ANI_NL_MSG_MAX
+struct wlan_rps_data {
+ char ifname[IFNAMSIZ];
+ uint16_t num_queues;
+ uint16_t cpu_map[WLAN_SVC_IFACE_NUM_QUEUES];
+};
+
//All Netlink messages must contain this header
typedef struct sAniHdr {
unsigned short type;
diff --git a/CORE/SVC/inc/wlan_logging_sock_svc.h b/CORE/SVC/inc/wlan_logging_sock_svc.h
index 2cd6745..52d1959 100644
--- a/CORE/SVC/inc/wlan_logging_sock_svc.h
+++ b/CORE/SVC/inc/wlan_logging_sock_svc.h
@@ -63,5 +63,5 @@
void wlan_logging_set_log_level(void);
-
+bool wlan_is_logger_thread(int threadId);
#endif /* WLAN_LOGGING_SOCK_SVC_H */
diff --git a/CORE/SVC/src/logging/wlan_logging_sock_svc.c b/CORE/SVC/src/logging/wlan_logging_sock_svc.c
index 6fa1b6d..1c71310 100644
--- a/CORE/SVC/src/logging/wlan_logging_sock_svc.c
+++ b/CORE/SVC/src/logging/wlan_logging_sock_svc.c
@@ -42,6 +42,7 @@
#include "vos_memory.h"
#include <linux/ratelimit.h>
#include <asm/arch_timer.h>
+#include <vos_utils.h>
#define LOGGING_TRACE(level, args...) \
VOS_TRACE(VOS_MODULE_ID_SVC, level, ## args)
@@ -729,15 +730,17 @@
#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0))
daemonize("wlan_logging_thread");
#endif
-
while (!gwlan_logging.exit) {
ret_wait_status = wait_event_interruptible(
gwlan_logging.wait_queue,
(test_bit(HOST_LOG_POST_MASK, &gwlan_logging.event_flag) ||
gwlan_logging.exit ||
- test_bit(LOGGER_MGMT_DATA_PKT_POST_MASK,&gwlan_logging.event_flag) ||
- test_bit(LOGGER_FW_LOG_PKT_POST_MASK, &gwlan_logging.event_flag) ||
- test_bit(LOGGER_FATAL_EVENT_POST_MASK, &gwlan_logging.event_flag)));
+ test_bit(LOGGER_MGMT_DATA_PKT_POST_MASK,
+ &gwlan_logging.event_flag) ||
+ test_bit(LOGGER_FW_LOG_PKT_POST_MASK,
+ &gwlan_logging.event_flag) ||
+ test_bit(LOGGER_FATAL_EVENT_POST_MASK,
+ &gwlan_logging.event_flag)));
if (ret_wait_status == -ERESTARTSYS) {
pr_err("%s: wait_event return -ERESTARTSYS", __func__);
@@ -1206,7 +1209,6 @@
return status;
}
-
void wlan_process_done_indication(uint8 type, uint32 reason_code)
{
if ((type == WLAN_QXDM_LOGGING) && (wlan_is_log_report_in_progress() == TRUE))
@@ -1217,4 +1219,20 @@
}
}
+/**
+ * wlan_is_logger_thread()- Check if threadid is
+ * of logger thread
+ *
+ * @threadId: passed threadid
+ *
+ * This function is called to check if threadid is
+ * of logger thread.
+ *
+ * Return: true if threadid is of logger thread.
+ */
+bool wlan_is_logger_thread(int threadId)
+{
+ return ((gwlan_logging.thread) &&
+ (threadId == gwlan_logging.thread->pid));
+}
#endif /* WLAN_LOGGING_SOCK_SVC_ENABLE */
diff --git a/CORE/SYS/common/inc/wlan_qct_sys.h b/CORE/SYS/common/inc/wlan_qct_sys.h
index 038aa6d..f85d29d 100644
--- a/CORE/SYS/common/inc/wlan_qct_sys.h
+++ b/CORE/SYS/common/inc/wlan_qct_sys.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2013 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -70,6 +70,8 @@
--------------------------------------------------------------------------*/
typedef v_VOID_t ( * sysResponseCback ) ( v_VOID_t *pUserData );
+typedef v_VOID_t ( * sysThreadProbeCback ) ( int threadId );
+
@@ -87,6 +89,7 @@
SYS_MSG_ID_MC_STOP,
SYS_MSG_ID_FTM_RSP,
+ SYS_MSG_ID_RX_THR_PROBE,
} SYS_MSG_ID;
/*---------------------------------------------------------------------------
diff --git a/CORE/SYS/common/src/wlan_qct_sys.c b/CORE/SYS/common/src/wlan_qct_sys.c
index 8bdef80..f55bd8c 100644
--- a/CORE/SYS/common/src/wlan_qct_sys.c
+++ b/CORE/SYS/common/src/wlan_qct_sys.c
@@ -382,9 +382,10 @@
// function that is in the message.
case SYS_MSG_ID_MC_THR_PROBE:
{
- VOS_TRACE(VOS_MODULE_ID_SYS, VOS_TRACE_LEVEL_ERROR,
- " Received SYS_MSG_ID_MC_THR_PROBE message msgType = %d [0x%08x]",
- pMsg->type, pMsg->type);
+#ifdef WLAN_LOGGING_SOCK_SVC_ENABLE
+ if(pMsg->callback)
+ ((sysThreadProbeCback)pMsg->callback)(current->pid);
+#endif
break;
}
@@ -405,7 +406,6 @@
WLANFTM_McProcessMsg((v_VOID_t *)pMsg->bodyptr);
break;
}
-
default:
{
VOS_TRACE( VOS_MODULE_ID_SYS, VOS_TRACE_LEVEL_ERROR,
@@ -471,13 +471,10 @@
// function that is in the message.
case SYS_MSG_ID_TX_THR_PROBE:
{
- /* Handling for this message is not needed now so adding
- * debug print and VOS_ASSERT*/
- VOS_TRACE( VOS_MODULE_ID_SYS, VOS_TRACE_LEVEL_ERROR,
- " Received SYS_MSG_ID_TX_THR_PROBE message msgType= %d [0x%08x]",
- pMsg->type, pMsg->type );
- VOS_ASSERT(0);
-
+#ifdef WLAN_LOGGING_SOCK_SVC_ENABLE
+ if(pMsg->callback)
+ ((sysThreadProbeCback)pMsg->callback)(current->pid);
+#endif
break;
}
@@ -550,6 +547,15 @@
break;
}
+ case SYS_MSG_ID_RX_THR_PROBE:
+ {
+#ifdef WLAN_LOGGING_SOCK_SVC_ENABLE
+ if(pMsg->callback)
+ ((sysThreadProbeCback)pMsg->callback)(current->pid);
+#endif
+ break;
+ }
+
default:
{
VOS_TRACE( VOS_MODULE_ID_SYS, VOS_TRACE_LEVEL_ERROR,
diff --git a/CORE/SYS/legacy/src/utils/src/macTrace.c b/CORE/SYS/legacy/src/utils/src/macTrace.c
index 7f2a442..0003a52 100644
--- a/CORE/SYS/legacy/src/utils/src/macTrace.c
+++ b/CORE/SYS/legacy/src/utils/src/macTrace.c
@@ -436,7 +436,6 @@
CASE_RETURN_STRING(eWNI_SME_REMAIN_ON_CHANNEL_REQ);
CASE_RETURN_STRING(eWNI_SME_REMAIN_ON_CHN_IND);
CASE_RETURN_STRING(eWNI_SME_REMAIN_ON_CHN_RSP);
- CASE_RETURN_STRING(eWNI_SME_MGMT_FRM_IND);
CASE_RETURN_STRING(eWNI_SME_REMAIN_ON_CHN_RDY_IND);
CASE_RETURN_STRING(eWNI_SME_SEND_ACTION_FRAME_IND);
CASE_RETURN_STRING(eWNI_SME_ACTION_FRAME_SEND_CNF);
@@ -567,6 +566,7 @@
CASE_RETURN_STRING(eWNI_SME_MAC_SPOOF_ADDR_IND);
CASE_RETURN_STRING(eWNI_SME_UPDATE_MAX_RATE_IND);
CASE_RETURN_STRING(eWNI_SME_SET_TDLS_2040_BSSCOEX_REQ);
+ CASE_RETURN_STRING(eWNI_SME_REGISTER_MGMT_FRAME_CB);
CASE_RETURN_STRING(eWNI_SME_MSG_TYPES_END);
default:
return( (tANI_U8*)"UNKNOWN" );
diff --git a/CORE/VOSS/inc/i_vos_types.h b/CORE/VOSS/inc/i_vos_types.h
index cd03d2f..72c7421 100644
--- a/CORE/VOSS/inc/i_vos_types.h
+++ b/CORE/VOSS/inc/i_vos_types.h
@@ -35,6 +35,7 @@
#include <linux/string.h>
#include <linux/slab.h>
#include <linux/interrupt.h>
+#include <linux/version.h>
#include <asm/div64.h>
/**=========================================================================
diff --git a/CORE/VOSS/inc/vos_api.h b/CORE/VOSS/inc/vos_api.h
index 100ac75..7e5d0da 100644
--- a/CORE/VOSS/inc/vos_api.h
+++ b/CORE/VOSS/inc/vos_api.h
@@ -436,4 +436,5 @@
v_BOOL_t vos_isUnloadInProgress(void);
v_BOOL_t vos_isLoadUnloadInProgress(void);
+void vos_probe_threads(void);
#endif // if !defined __VOS_NVITEM_H
diff --git a/CORE/VOSS/inc/vos_event.h b/CORE/VOSS/inc/vos_event.h
index fb9762a..c039464 100644
--- a/CORE/VOSS/inc/vos_event.h
+++ b/CORE/VOSS/inc/vos_event.h
@@ -55,6 +55,10 @@
extern "C" {
#endif /* __cplusplus */
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0))
+#define INIT_COMPLETION(event) reinit_completion(&event)
+#endif
+
/*--------------------------------------------------------------------------
Type declarations
------------------------------------------------------------------------*/
diff --git a/CORE/VOSS/inc/vos_memory.h b/CORE/VOSS/inc/vos_memory.h
index 2c518e9..c6de77e 100644
--- a/CORE/VOSS/inc/vos_memory.h
+++ b/CORE/VOSS/inc/vos_memory.h
@@ -45,7 +45,7 @@
Include Files
------------------------------------------------------------------------*/
#include <vos_types.h>
-
+#include <linux/version.h>
/*--------------------------------------------------------------------------
Preprocessor definitions and constants
------------------------------------------------------------------------*/
@@ -210,7 +210,18 @@
locations are equal or not equal.
-------------------------------------------------------------------------------*/
-v_BOOL_t vos_mem_compare( v_VOID_t *pMemory1, v_VOID_t *pMemory2, v_U32_t numBytes );
+v_BOOL_t vos_mem_compare(
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0))
+ const v_VOID_t *pMemory1,
+#else
+ v_VOID_t *pMemory1,
+#endif
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0))
+ const v_VOID_t *pMemory2,
+#else
+ v_VOID_t *pMemory2,
+#endif
+ v_U32_t numBytes);
/** ---------------------------------------------------------------------------
diff --git a/CORE/VOSS/inc/vos_mq.h b/CORE/VOSS/inc/vos_mq.h
index 7194e35..e82dd00 100644
--- a/CORE/VOSS/inc/vos_mq.h
+++ b/CORE/VOSS/inc/vos_mq.h
@@ -156,6 +156,43 @@
--------------------------------------------------------------------------*/
VOS_STATUS vos_mq_post_message( VOS_MQ_ID msgQueueId, vos_msg_t *message );
+/**--------------------------------------------------------------------------
+ \brief vos_mq_post_message_high_pri() - posts a high priority message to
+ a message queue
+
+ This API allows messages to be posted to the head of a specific message
+ queue. Messages can be posted to the following message queues:
+
+ <ul>
+ <li> SME
+ <li> PE
+ <li> HAL
+ <li> TL
+ </ul>
+
+ \param msgQueueId - identifies the message queue upon which the message
+ will be posted.
+
+ \param message - a pointer to a message buffer. Memory for this message
+ buffer is allocated by the caller and free'd by the vOSS after the
+ message is posted to the message queue. If the consumer of the
+ message needs anything in this message, it needs to copy the contents
+ before returning from the message queue handler.
+
+ \return VOS_STATUS_SUCCESS - the message has been successfully posted
+ to the message queue.
+
+ VOS_STATUS_E_INVAL - The value specified by msgQueueId does not
+ refer to a valid Message Queue Id.
+
+ VOS_STATUS_E_FAULT - message is an invalid pointer.
+
+ VOS_STATUS_E_FAILURE - the message queue handler has reported
+ an unknown failure.
+ --------------------------------------------------------------------------*/
+
+VOS_STATUS vos_mq_post_message_high_pri(VOS_MQ_ID msgQueueId, vos_msg_t *message);
+
/**---------------------------------------------------------------------------
diff --git a/CORE/VOSS/inc/vos_nvitem.h b/CORE/VOSS/inc/vos_nvitem.h
index caec9fe..c180d1c 100644
--- a/CORE/VOSS/inc/vos_nvitem.h
+++ b/CORE/VOSS/inc/vos_nvitem.h
@@ -131,6 +131,10 @@
* to esp_dpp.h where the WLAN_PROVISION_DATA is present.
*/
#define CLPC_PROVISION_DATA L"WLAN_CLPC.PROVISION"
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0))
+#define IEEE80211_CHAN_PASSIVE_SCAN IEEE80211_CHAN_NO_IR
+#define IEEE80211_CHAN_NO_IBSS IEEE80211_CHAN_NO_IR
+#endif
/*--------------------------------------------------------------------------
Type declarations
------------------------------------------------------------------------*/
diff --git a/CORE/VOSS/inc/vos_utils.h b/CORE/VOSS/inc/vos_utils.h
index ff7d8a9..5755336 100644
--- a/CORE/VOSS/inc/vos_utils.h
+++ b/CORE/VOSS/inc/vos_utils.h
@@ -47,6 +47,7 @@
------------------------------------------------------------------------*/
#include <vos_types.h>
#include <vos_status.h>
+#include <vos_event.h>
//#include <Wincrypt.h>
/*--------------------------------------------------------------------------
diff --git a/CORE/VOSS/src/vos_api.c b/CORE/VOSS/src/vos_api.c
index 21484db..66ed456 100644
--- a/CORE/VOSS/src/vos_api.c
+++ b/CORE/VOSS/src/vos_api.c
@@ -1995,6 +1995,143 @@
} /* vos_mq_post_message()*/
+/**--------------------------------------------------------------------------
+ \brief vos_mq_post_message_high_pri() - posts a high priority message to
+ a message queue
+
+ This API allows messages to be posted to the head of a specific message
+ queue. Messages can be posted to the following message queues:
+
+ <ul>
+ <li> SME
+ <li> PE
+ <li> HAL
+ <li> TL
+ </ul>
+
+ \param msgQueueId - identifies the message queue upon which the message
+ will be posted.
+
+ \param message - a pointer to a message buffer. Memory for this message
+ buffer is allocated by the caller and free'd by the vOSS after the
+ message is posted to the message queue. If the consumer of the
+ message needs anything in this message, it needs to copy the contents
+ before returning from the message queue handler.
+
+ \return VOS_STATUS_SUCCESS - the message has been successfully posted
+ to the message queue.
+
+ VOS_STATUS_E_INVAL - The value specified by msgQueueId does not
+ refer to a valid Message Queue Id.
+
+ VOS_STATUS_E_FAULT - message is an invalid pointer.
+
+ VOS_STATUS_E_FAILURE - the message queue handler has reported
+ an unknown failure.
+ --------------------------------------------------------------------------*/
+VOS_STATUS vos_mq_post_message_high_pri(VOS_MQ_ID msgQueueId, vos_msg_t *pMsg)
+{
+ pVosMqType pTargetMq = NULL;
+ pVosMsgWrapper pMsgWrapper = NULL;
+
+ if ((gpVosContext == NULL) || (pMsg == NULL))
+ {
+ VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
+ "%s: Null params or global vos context is null", __func__);
+ VOS_ASSERT(0);
+ return VOS_STATUS_E_FAILURE;
+ }
+
+ switch (msgQueueId)
+ {
+ /// Message Queue ID for messages bound for SME
+ case VOS_MQ_ID_SME:
+ {
+ pTargetMq = &(gpVosContext->vosSched.smeMcMq);
+ break;
+ }
+
+ /// Message Queue ID for messages bound for PE
+ case VOS_MQ_ID_PE:
+ {
+ pTargetMq = &(gpVosContext->vosSched.peMcMq);
+ break;
+ }
+
+ /// Message Queue ID for messages bound for WDA
+ case VOS_MQ_ID_WDA:
+ {
+ pTargetMq = &(gpVosContext->vosSched.wdaMcMq);
+ break;
+ }
+
+ /// Message Queue ID for messages bound for WDI
+ case VOS_MQ_ID_WDI:
+ {
+ pTargetMq = &(gpVosContext->vosSched.wdiMcMq);
+ break;
+ }
+
+ /// Message Queue ID for messages bound for TL
+ case VOS_MQ_ID_TL:
+ {
+ pTargetMq = &(gpVosContext->vosSched.tlMcMq);
+ break;
+ }
+
+ /// Message Queue ID for messages bound for the SYS module
+ case VOS_MQ_ID_SYS:
+ {
+ pTargetMq = &(gpVosContext->vosSched.sysMcMq);
+ break;
+ }
+
+ default:
+
+ VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
+ ("%s: Trying to queue msg into unknown MC Msg queue ID %d"),
+ __func__, msgQueueId);
+
+ return VOS_STATUS_E_FAILURE;
+ }
+
+ VOS_ASSERT(NULL !=pTargetMq);
+ if (pTargetMq == NULL)
+ {
+ VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
+ "%s: pTargetMq == NULL", __func__);
+ return VOS_STATUS_E_FAILURE;
+ }
+
+ /*
+ ** Try and get a free Msg wrapper
+ */
+ pMsgWrapper = vos_mq_get(&gpVosContext->freeVosMq);
+
+ if (NULL == pMsgWrapper)
+ {
+ VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
+ "%s: VOS Core run out of message wrapper", __func__);
+ return VOS_STATUS_E_RESOURCES;
+ }
+
+ /*
+ ** Copy the message now
+ */
+ vos_mem_copy( (v_VOID_t*)pMsgWrapper->pVosMsg,
+ (v_VOID_t*)pMsg, sizeof(vos_msg_t));
+
+ vos_mq_put_front(pTargetMq, pMsgWrapper);
+
+ set_bit(MC_POST_EVENT_MASK, &gpVosContext->vosSched.mcEventFlag);
+ wake_up_interruptible(&gpVosContext->vosSched.mcWaitQueue);
+
+ return VOS_STATUS_SUCCESS;
+
+} /* vos_mq_post_message_high_pri()*/
+
+
+
/**---------------------------------------------------------------------------
\brief vos_tx_mq_serialize() - serialize a message to the Tx execution flow
@@ -2903,3 +3040,37 @@
return (WLAN_HDD_UNLOAD_IN_PROGRESS == pHddCtx->isLoadUnloadInProgress);
}
+/**
+ * vos_probe_threads() - VOS API to post messages
+ * to all the threads to detect if they are active or not
+ *
+ * Return none.
+ *
+ */
+void vos_probe_threads(void)
+{
+ vos_msg_t msg;
+
+ msg.callback = vos_wd_reset_thread_stuck_count;
+ /* Post Message to MC Thread */
+ sysBuildMessageHeader(SYS_MSG_ID_MC_THR_PROBE, &msg);
+ if (VOS_STATUS_SUCCESS != vos_mq_post_message(VOS_MQ_ID_SYS, &msg)) {
+ VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
+ FL("Unable to post SYS_MSG_ID_MC_THR_PROBE message to MC thread"));
+ }
+
+ /* Post Message to Tx Thread */
+ sysBuildMessageHeader(SYS_MSG_ID_TX_THR_PROBE, &msg);
+ if (VOS_STATUS_SUCCESS != vos_tx_mq_serialize(VOS_MQ_ID_SYS, &msg)) {
+ VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
+ FL("Unable to post SYS_MSG_ID_TX_THR_PROBE message to TX thread"));
+ }
+
+ /* Post Message to Rx Thread */
+ sysBuildMessageHeader(SYS_MSG_ID_RX_THR_PROBE, &msg);
+ if (VOS_STATUS_SUCCESS != vos_rx_mq_serialize(VOS_MQ_ID_SYS, &msg)) {
+ VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
+ FL("Unable to post SYS_MSG_ID_RX_THR_PROBE message to RX thread"));
+ }
+}
+
diff --git a/CORE/VOSS/src/vos_memory.c b/CORE/VOSS/src/vos_memory.c
index 3b304c1..accf991 100644
--- a/CORE/VOSS/src/vos_memory.c
+++ b/CORE/VOSS/src/vos_memory.c
@@ -55,12 +55,14 @@
* ------------------------------------------------------------------------*/
#include "vos_memory.h"
#include "vos_trace.h"
+#include "vos_api.h"
#include <vmalloc.h>
#ifdef CONFIG_WCNSS_MEM_PRE_ALLOC
#include <linux/wcnss_wlan.h>
#define WCNSS_PRE_ALLOC_GET_THRESHOLD (4*1024)
#endif
+#define VOS_GET_MEMORY_TIME_THRESHOLD 3000
#ifdef MEMORY_DEBUG
#include "wlan_hdd_dp_utils.h"
@@ -189,6 +191,7 @@
v_SIZE_t new_size;
int flags = GFP_KERNEL;
unsigned long IrqFlags;
+ unsigned long time_before_kmalloc;
if (size > (1024*1024) || size == 0)
@@ -214,12 +217,30 @@
return pmem;
}
#endif
- return kmalloc(size, flags);
+ time_before_kmalloc = vos_timer_get_system_time();
+ memPtr = kmalloc(size, flags);
+
+ /* If time taken by kmalloc is greater than VOS_GET_MEMORY_TIME_THRESHOLD
+ * msec */
+ if (vos_timer_get_system_time() - time_before_kmalloc >=
+ VOS_GET_MEMORY_TIME_THRESHOLD)
+ VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
+ "%s: kmalloc took %lu msec", __func__,
+ vos_timer_get_system_time() - time_before_kmalloc);
+ return memPtr;
}
new_size = size + sizeof(struct s_vos_mem_struct) + 8;
+ time_before_kmalloc = vos_timer_get_system_time();
memStruct = (struct s_vos_mem_struct*)kmalloc(new_size, flags);
+ /* If time taken by kmalloc is greater than VOS_GET_MEMORY_TIME_THRESHOLD
+ * msec */
+ if (vos_timer_get_system_time() - time_before_kmalloc >=
+ VOS_GET_MEMORY_TIME_THRESHOLD)
+ VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
+ "%s: kmalloc took %lu msec", __func__,
+ vos_timer_get_system_time() - time_before_kmalloc);
if(memStruct != NULL)
{
@@ -298,9 +319,12 @@
v_VOID_t * vos_mem_malloc( v_SIZE_t size )
{
int flags = GFP_KERNEL;
+ v_VOID_t* memPtr = NULL;
#ifdef CONFIG_WCNSS_MEM_PRE_ALLOC
v_VOID_t* pmem;
#endif
+ unsigned long time_before_kmalloc;
+
if (size > (1024*1024) || size == 0)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
@@ -319,8 +343,19 @@
return pmem;
}
#endif
- return kmalloc(size, flags);
-}
+ time_before_kmalloc = vos_timer_get_system_time();
+ memPtr = kmalloc(size, flags);
+ /* If time taken by kmalloc is greater than VOS_GET_MEMORY_TIME_THRESHOLD
+ * msec */
+ if (vos_timer_get_system_time() - time_before_kmalloc >=
+ VOS_GET_MEMORY_TIME_THRESHOLD)
+ VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
+ "%s: kmalloc took %lu msec", __func__,
+ vos_timer_get_system_time() - time_before_kmalloc);
+
+ return memPtr;
+
+}
v_VOID_t vos_mem_free( v_VOID_t *ptr )
{
@@ -426,7 +461,18 @@
memmove(pDst, pSrc, numBytes);
}
-v_BOOL_t vos_mem_compare( v_VOID_t *pMemory1, v_VOID_t *pMemory2, v_U32_t numBytes )
+v_BOOL_t vos_mem_compare(
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0))
+ const v_VOID_t *pMemory1,
+#else
+ v_VOID_t *pMemory1,
+#endif
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0))
+ const v_VOID_t *pMemory2,
+#else
+ v_VOID_t *pMemory2,
+#endif
+ v_U32_t numBytes )
{
if (0 == numBytes)
{
diff --git a/CORE/VOSS/src/vos_mq.c b/CORE/VOSS/src/vos_mq.c
index b428189..91ed206 100644
--- a/CORE/VOSS/src/vos_mq.c
+++ b/CORE/VOSS/src/vos_mq.c
@@ -163,6 +163,42 @@
} /* vos_mq_put() */
+/*---------------------------------------------------------------------------
+
+ \brief vos_mq_put_front() - Add a message to the head of message queue
+
+ The \a vos_mq_put_front() function add a message to the head of Message queue.
+
+ \param pMq - pointer to the message queue
+
+ \param pMsgWrapper - Msg Wrapper containing the message
+
+ \return None
+
+ \sa vos_mq_put()
+
+---------------------------------------------------------------------------*/
+void vos_mq_put_front(pVosMqType pMq, pVosMsgWrapper pMsgWrapper)
+{
+ unsigned long flags;
+
+ /*
+ ** Some quick sanity check
+ */
+ if ((pMq == NULL) || (pMsgWrapper == NULL)) {
+ VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
+ "%s: NULL pointer passed",__func__);
+ return ;
+ }
+
+ spin_lock_irqsave(&pMq->mqLock, flags);
+
+ list_add(&pMsgWrapper->msgNode, &pMq->mqList);
+
+ spin_unlock_irqrestore(&pMq->mqLock, flags);
+
+} /* vos_mq_put_front() */
+
/*---------------------------------------------------------------------------
diff --git a/CORE/VOSS/src/vos_nvitem.c b/CORE/VOSS/src/vos_nvitem.c
index 3246919..bde1bd8 100644
--- a/CORE/VOSS/src/vos_nvitem.c
+++ b/CORE/VOSS/src/vos_nvitem.c
@@ -3641,7 +3641,11 @@
* will not change channel to active.
*/
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0))
+ if (!(wiphy->regulatory_flags & REGULATORY_STRICT_REG))
+#else
if (!(wiphy->flags & WIPHY_FLAG_STRICT_REGULATORY ))
+#endif
{
if (!(reg_rule->flags & NL80211_RRF_PASSIVE_SCAN))
{
@@ -4193,7 +4197,11 @@
/* default country is world roaming */
reg_domain = REGDOMAIN_WORLD;
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0))
+ wiphy->regulatory_flags |= REGULATORY_CUSTOM_REG;
+#else
wiphy->flags |= WIPHY_FLAG_CUSTOM_REGULATORY;
+#endif
}
else if (REGDOMAIN_WORLD ==
pnvEFSTable->halnv.tables.defaultCountryTable.regDomain) {
@@ -4203,7 +4211,11 @@
else {
reg_domain = pnvEFSTable->halnv.tables.defaultCountryTable.regDomain;
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0))
+ wiphy->regulatory_flags |= REGULATORY_STRICT_REG;
+#else
wiphy->flags |= WIPHY_FLAG_STRICT_REGULATORY;
+#endif
}
temp_reg_domain = cur_reg_domain = reg_domain;
diff --git a/CORE/VOSS/src/vos_sched.c b/CORE/VOSS/src/vos_sched.c
index 27a4dbe..8bcf8b9 100644
--- a/CORE/VOSS/src/vos_sched.c
+++ b/CORE/VOSS/src/vos_sched.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -69,6 +69,10 @@
* we proceed with SSR in WD Thread
*/
#define MAX_SSR_WAIT_ITERATIONS 200
+/* Timer value for detecting thread stuck issues */
+#define THREAD_STUCK_TIMER_VAL 5000 // 5 seconds
+#define THREAD_STUCK_COUNT 3
+
static atomic_t ssr_protect_entry_count;
@@ -298,6 +302,7 @@
// Initialize the lock
spin_lock_init(&pWdContext->wdLock);
+ spin_lock_init(&pWdContext->thread_stuck_lock);
//Create the Watchdog thread
pWdContext->WdThread = kthread_create(VosWDThread, pWdContext,"VosWDThread");
@@ -641,6 +646,109 @@
return (pHddCtx->cfg_ini->fIsSsrPanicOnFailure);
}
+/**
+ * vos_wd_detect_thread_stuck()- Detect thread stuck
+ * by probing the MC, TX, RX threads and take action if
+ * Thread doesnt respond.
+ *
+ * This function is called to detect thread stuck
+ * and probe threads.
+ *
+ * Return: void
+ */
+static void vos_wd_detect_thread_stuck(void)
+{
+ unsigned long flags;
+
+ spin_lock_irqsave(&gpVosWatchdogContext->thread_stuck_lock, flags);
+
+ if ((gpVosWatchdogContext->mcThreadStuckCount == THREAD_STUCK_COUNT) ||
+ (gpVosWatchdogContext->txThreadStuckCount == THREAD_STUCK_COUNT) ||
+ (gpVosWatchdogContext->rxThreadStuckCount == THREAD_STUCK_COUNT))
+ {
+ spin_unlock_irqrestore(&gpVosWatchdogContext->thread_stuck_lock, flags);
+ hddLog(LOGE, FL("Thread Stuck !!! MC Count %d RX count %d TX count %d"),
+ gpVosWatchdogContext->mcThreadStuckCount,
+ gpVosWatchdogContext->rxThreadStuckCount,
+ gpVosWatchdogContext->txThreadStuckCount);
+ vos_wlanRestart();
+ return;
+ }
+
+ if (gpVosWatchdogContext->mcThreadStuckCount ||
+ gpVosWatchdogContext->txThreadStuckCount ||
+ gpVosWatchdogContext->rxThreadStuckCount)
+ {
+ spin_unlock_irqrestore(&gpVosWatchdogContext->thread_stuck_lock, flags);
+
+ hddLog(LOG1, FL("MC Count %d RX count %d TX count %d"),
+ gpVosWatchdogContext->mcThreadStuckCount,
+ gpVosWatchdogContext->rxThreadStuckCount,
+ gpVosWatchdogContext->txThreadStuckCount);
+
+ spin_lock_irqsave(&gpVosWatchdogContext->thread_stuck_lock, flags);
+ }
+
+ /* Increment the thread stuck count for all threads */
+ gpVosWatchdogContext->mcThreadStuckCount++;
+ gpVosWatchdogContext->txThreadStuckCount++;
+ gpVosWatchdogContext->rxThreadStuckCount++;
+
+ spin_unlock_irqrestore(&gpVosWatchdogContext->thread_stuck_lock, flags);
+ vos_probe_threads();
+
+ /* Restart the timer */
+ if (VOS_STATUS_SUCCESS !=
+ vos_timer_start(&gpVosWatchdogContext->threadStuckTimer,
+ THREAD_STUCK_TIMER_VAL))
+ hddLog(LOGE, FL("Unable to start thread stuck timer"));
+}
+
+/**
+ * wlan_wd_detect_thread_stuck_cb()- Call back of the
+ * thread stuck timer.
+ * @priv: timer data.
+ * This function is called when the thread stuck timer
+ * expire to detect thread stuck and probe threads.
+ *
+ * Return: void
+ */
+static void vos_wd_detect_thread_stuck_cb(void *priv)
+{
+ if (!(vos_is_logp_in_progress(VOS_MODULE_ID_SYS, NULL) ||
+ vos_is_load_unload_in_progress(VOS_MODULE_ID_SYS, NULL)))
+ {
+ set_bit(WD_WLAN_DETECT_THREAD_STUCK_MASK,
+ &gpVosWatchdogContext->wdEventFlag);
+ set_bit(WD_POST_EVENT_MASK, &gpVosWatchdogContext->wdEventFlag);
+ wake_up_interruptible(&gpVosWatchdogContext->wdWaitQueue);
+ }
+}
+
+/**
+ * wlan_logging_reset_thread_stuck_count()- Callback to
+ * probe msg sent to Threads.
+ *
+ * @threadId: passed threadid
+ *
+ * This function is called to by the thread after
+ * processing the probe msg, with their own thread id.
+ *
+ * Return: void.
+ */
+void vos_wd_reset_thread_stuck_count(int threadId)
+{
+ unsigned long flags;
+
+ spin_lock_irqsave(&gpVosWatchdogContext->thread_stuck_lock, flags);
+ if (vos_sched_is_mc_thread(threadId))
+ gpVosWatchdogContext->mcThreadStuckCount = 0;
+ else if (vos_sched_is_tx_thread(threadId))
+ gpVosWatchdogContext->txThreadStuckCount = 0;
+ else if (vos_sched_is_rx_thread(threadId))
+ gpVosWatchdogContext->rxThreadStuckCount = 0;
+ spin_unlock_irqrestore(&gpVosWatchdogContext->thread_stuck_lock, flags);
+}
/*---------------------------------------------------------------------------
\brief VosWdThread() - The VOSS Watchdog thread
@@ -692,6 +800,20 @@
#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0))
daemonize("WD_Thread");
#endif
+ /* Initialize the timer to detect thread stuck issues */
+ if (vos_timer_init(&pWdContext->threadStuckTimer, VOS_TIMER_TYPE_SW,
+ vos_wd_detect_thread_stuck_cb, NULL)) {
+ hddLog(LOGE, FL("Unable to initialize thread stuck timer"));
+ }
+ else
+ {
+ if (VOS_STATUS_SUCCESS !=
+ vos_timer_start(&pWdContext->threadStuckTimer,
+ THREAD_STUCK_TIMER_VAL))
+ hddLog(LOGE, FL("Unable to start thread stuck timer"));
+ else
+ hddLog(LOG1, FL("Successfully started thread stuck timer"));
+ }
/*
** Ack back to the context from which the Watchdog thread has been
@@ -747,7 +869,6 @@
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_INFO,
"%s: Watchdog thread signaled to shutdown", __func__);
-
clear_bit(WD_SHUTDOWN_EVENT_MASK, &pWdContext->wdEventFlag);
shutdown = VOS_TRUE;
break;
@@ -807,6 +928,12 @@
pWdContext->resetInProgress = false;
complete(&pHddCtx->ssr_comp_var);
}
+ /* Post Msg to detect thread stuck */
+ else if(test_and_clear_bit(WD_WLAN_DETECT_THREAD_STUCK_MASK,
+ &pWdContext->wdEventFlag))
+ {
+ vos_wd_detect_thread_stuck();
+ }
else
{
//Unnecessary wakeup - Should never happen!!
@@ -817,6 +944,7 @@
} // while message loop processing
} // while shutdown
+ vos_timer_destroy(&pWdContext->threadStuckTimer);
// If we get here the Watchdog thread must exit
VOS_TRACE( VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_INFO,
"%s: Watchdog Thread exiting !!!!", __func__);
@@ -1782,6 +1910,24 @@
}
return ((gpVosSchedContext->RxThread) && (threadID == gpVosSchedContext->RxThread->pid));
}
+
+/*-------------------------------------------------------------------------
+ This helper function helps determine if thread id is of MC thread
+ ------------------------------------------------------------------------*/
+int vos_sched_is_mc_thread(int threadID)
+{
+ // Make sure that Vos Scheduler context has been initialized
+ VOS_ASSERT( NULL != gpVosSchedContext);
+ if (gpVosSchedContext == NULL)
+ {
+ VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
+ "%s: gpVosSchedContext == NULL",__func__);
+ return 0;
+ }
+ return ((gpVosSchedContext->McThread) &&
+ (threadID == gpVosSchedContext->McThread->pid));
+}
+
/*-------------------------------------------------------------------------
Helper function to get the scheduler context
------------------------------------------------------------------------*/
@@ -1970,3 +2116,20 @@
int count;
count = atomic_dec_return(&ssr_protect_entry_count);
}
+/**
+ * vos_is_wd_thread()- Check if threadid is
+ * of Watchdog thread
+ *
+ * @threadId: passed threadid
+ *
+ * This function is called to check if threadid is
+ * of wd thread.
+ *
+ * Return: true if threadid is of wd thread.
+ */
+bool vos_is_wd_thread(int threadId)
+{
+ return ((gpVosWatchdogContext->WdThread) &&
+ (threadId == gpVosWatchdogContext->WdThread->pid));
+}
+
diff --git a/CORE/VOSS/src/vos_sched.h b/CORE/VOSS/src/vos_sched.h
index f9c3b65..c757976 100644
--- a/CORE/VOSS/src/vos_sched.h
+++ b/CORE/VOSS/src/vos_sched.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -74,6 +74,8 @@
#include "i_vos_packet.h"
#include <linux/wait.h>
#include <linux/wakelock.h>
+#include <vos_timer.h>
+
#define TX_POST_EVENT_MASK 0x001
#define TX_SUSPEND_EVENT_MASK 0x002
@@ -89,6 +91,8 @@
#define WD_CHIP_RESET_EVENT_MASK 0x004
#define WD_WLAN_SHUTDOWN_EVENT_MASK 0x008
#define WD_WLAN_REINIT_EVENT_MASK 0x010
+#define WD_WLAN_DETECT_THREAD_STUCK_MASK 0x020
+
@@ -260,6 +264,14 @@
/* Lock for preventing multiple reset being triggered simultaneously */
spinlock_t wdLock;
+ /* Timer to detect thread stuck issue */
+ vos_timer_t threadStuckTimer;
+ /* Count for each thread to determine thread stuck */
+ unsigned int mcThreadStuckCount;
+ unsigned int txThreadStuckCount;
+ unsigned int rxThreadStuckCount;
+ /* lock to synchronize access to the thread stuck counts */
+ spinlock_t thread_stuck_lock;
} VosWatchdogContext, *pVosWatchdogContext;
@@ -349,6 +361,7 @@
int vos_sched_is_tx_thread(int threadID);
int vos_sched_is_rx_thread(int threadID);
+int vos_sched_is_mc_thread(int threadID);
/*---------------------------------------------------------------------------
\brief vos_sched_open() - initialize the vOSS Scheduler
@@ -487,6 +500,7 @@
VOS_STATUS vos_mq_init(pVosMqType pMq);
void vos_mq_deinit(pVosMqType pMq);
void vos_mq_put(pVosMqType pMq, pVosMsgWrapper pMsgWrapper);
+void vos_mq_put_front(pVosMqType pMq, pVosMsgWrapper pMsgWrapper);
pVosMsgWrapper vos_mq_get(pVosMqType pMq);
v_BOOL_t vos_is_mq_empty(pVosMqType pMq);
pVosSchedContext get_vos_sched_ctxt(void);
@@ -504,5 +518,9 @@
v_BOOL_t isSsrPanicOnFailure(void);
void vos_ssr_protect(const char *caller_func);
void vos_ssr_unprotect(const char *caller_func);
+void vos_wd_reset_thread_stuck_count(int threadId);
+bool vos_is_wd_thread(int threadId);
+
+
#endif // #if !defined __VOSS_SCHED_H
diff --git a/CORE/VOSS/src/vos_timer.c b/CORE/VOSS/src/vos_timer.c
index bcfff7d..a6b1ec4 100644
--- a/CORE/VOSS/src/vos_timer.c
+++ b/CORE/VOSS/src/vos_timer.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2013 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2013, 2015 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -215,7 +215,16 @@
if(vos_rx_mq_serialize( VOS_MQ_ID_SYS, &msg ) == VOS_STATUS_SUCCESS)
return;
}
- else
+#ifdef WLAN_LOGGING_SOCK_SVC_ENABLE
+ else if (vos_is_wd_thread(threadId))
+ {
+ VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_INFO,
+ "TIMER callback: running on wd thread");
+ callback(NULL);
+ return;
+ }
+#endif
+ else
{
VOS_TRACE( VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_INFO,
"TIMER callback: running on MC thread");
@@ -228,7 +237,7 @@
if(vos_mq_post_message( VOS_MQ_ID_SYS, &msg ) == VOS_STATUS_SUCCESS)
return;
- }
+ }
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
"%s: Could not enqueue timer to any queue", __func__);
@@ -443,7 +452,10 @@
// set the various members of the timer structure
// with arguments passed or with default values
spin_lock_init(&timer->platformInfo.spinlock);
- init_timer(&(timer->platformInfo.Timer));
+ if (VOS_TIMER_TYPE_SW == timerType)
+ init_timer_deferrable(&(timer->platformInfo.Timer));
+ else
+ init_timer(&(timer->platformInfo.Timer));
timer->platformInfo.Timer.function = vos_linux_timer_callback;
timer->platformInfo.Timer.data = (unsigned long)timer;
timer->callback = callback;
@@ -471,7 +483,10 @@
// set the various members of the timer structure
// with arguments passed or with default values
spin_lock_init(&timer->platformInfo.spinlock);
- init_timer(&(timer->platformInfo.Timer));
+ if (VOS_TIMER_TYPE_SW == timerType)
+ init_timer_deferrable(&(timer->platformInfo.Timer));
+ else
+ init_timer(&(timer->platformInfo.Timer));
timer->platformInfo.Timer.function = vos_linux_timer_callback;
timer->platformInfo.Timer.data = (unsigned long)timer;
timer->callback = callback;
diff --git a/CORE/WDA/inc/wlan_qct_wda.h b/CORE/WDA/inc/wlan_qct_wda.h
index 06d2839..25a7146 100644
--- a/CORE/WDA/inc/wlan_qct_wda.h
+++ b/CORE/WDA/inc/wlan_qct_wda.h
@@ -501,6 +501,7 @@
vos_event_t ftmStopDoneEvent;
tWDA_AddSelfStaDebugParams wdaAddSelfStaParams;
+ wpt_uint8 mgmtTxfailureCnt;
} tWDA_CbContext ;
diff --git a/CORE/WDA/src/wlan_qct_wda.c b/CORE/WDA/src/wlan_qct_wda.c
index e748a0b..dc5bbea 100644
--- a/CORE/WDA/src/wlan_qct_wda.c
+++ b/CORE/WDA/src/wlan_qct_wda.c
@@ -85,6 +85,13 @@
#define CONVERT_WDI2SIR_STATUS(x) \
((WDI_STATUS_SUCCESS != (x)) ? eSIR_FAILURE : eSIR_SUCCESS)
+/* Threshold to print tx time taken in ms*/
+#define WDA_TX_TIME_THRESHOLD 1000
+/* Recover with ssr if tx timeouts continuously
+ * for threshold number of times.
+ */
+#define WDA_TX_FAILURE_RECOVERY_THRESHOLD 3
+
#define IS_WDI_STATUS_FAILURE(status) \
((WDI_STATUS_SUCCESS != (status)) && (WDI_STATUS_PENDING != (status)))
#define CONVERT_WDI2VOS_STATUS(x) \
@@ -6169,8 +6176,8 @@
WDI_GetStatsRspParamsType *wdiGetStatsRsp,
void* pUserData)
{
- tWDA_CbContext *pWDA = (tWDA_CbContext *)pUserData ;
tAniGetPEStatsRsp *pGetPEStatsRspParams;
+ vos_msg_t vosMsg;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
"<------ %s " ,__func__);
@@ -6186,7 +6193,7 @@
return;
}
vos_mem_set(pGetPEStatsRspParams, wdiGetStatsRsp->usMsgLen, 0);
- pGetPEStatsRspParams->msgType = wdiGetStatsRsp->usMsgType;
+ pGetPEStatsRspParams->msgType = eWNI_SME_GET_STATISTICS_RSP;
pGetPEStatsRspParams->msgLen = sizeof(tAniGetPEStatsRsp) +
(wdiGetStatsRsp->usMsgLen - sizeof(WDI_GetStatsRspParamsType));
@@ -6199,8 +6206,17 @@
vos_mem_copy( pGetPEStatsRspParams + 1,
wdiGetStatsRsp + 1,
wdiGetStatsRsp->usMsgLen - sizeof(WDI_GetStatsRspParamsType));
- /* send response to UMAC*/
- WDA_SendMsg(pWDA, WDA_GET_STATISTICS_RSP, pGetPEStatsRspParams , 0) ;
+
+ vosMsg.type = eWNI_SME_GET_STATISTICS_RSP;
+ vosMsg.bodyptr = (void *)pGetPEStatsRspParams;
+ vosMsg.bodyval = 0;
+ if (VOS_STATUS_SUCCESS != vos_mq_post_message(VOS_MQ_ID_SME,
+ (vos_msg_t*)&vosMsg))
+ {
+ VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
+ "%s: fail to post eWNI_SME_GET_STATISTICS_RSP", __func__);
+ vos_mem_free(pGetPEStatsRspParams);
+ }
return;
}
@@ -6215,6 +6231,8 @@
WDI_Status status = WDI_STATUS_SUCCESS ;
WDI_GetStatsReqParamsType wdiGetStatsParam;
tAniGetPEStatsRsp *pGetPEStatsRspParams;
+ vos_msg_t vosMsg;
+
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
"------> %s " ,__func__);
wdiGetStatsParam.wdiGetStatsParamsInfo.ucSTAIdx =
@@ -6238,12 +6256,21 @@
vos_mem_free(pGetStatsParams);
return VOS_STATUS_E_NOMEM;
}
- pGetPEStatsRspParams->msgType = WDA_GET_STATISTICS_RSP;
+ pGetPEStatsRspParams->msgType = eWNI_SME_GET_STATISTICS_RSP;
pGetPEStatsRspParams->msgLen = sizeof(tAniGetPEStatsRsp);
pGetPEStatsRspParams->staId = pGetStatsParams->staId;
pGetPEStatsRspParams->rc = eSIR_FAILURE;
- WDA_SendMsg(pWDA, WDA_GET_STATISTICS_RSP,
- (void *)pGetPEStatsRspParams, 0) ;
+
+ vosMsg.type = eWNI_SME_GET_STATISTICS_RSP;
+ vosMsg.bodyptr = (void *)pGetPEStatsRspParams;
+ vosMsg.bodyval = 0;
+ if (VOS_STATUS_SUCCESS != vos_mq_post_message(VOS_MQ_ID_SME,
+ (vos_msg_t*)&vosMsg))
+ {
+ VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
+ "%s: fail to post eWNI_SME_GET_STATISTICS_RSP", __func__);
+ vos_mem_free(pGetPEStatsRspParams);
+ }
}
/* Free the request message */
vos_mem_free(pGetStatsParams);
@@ -13351,6 +13378,7 @@
tBssSystemRole systemRole = eSYSTEM_UNKNOWN_ROLE;
tpAniSirGlobal pMac;
tpSirTxBdStatus txBdStatus = {0};
+ v_TIME_t time_snapshot;
if((NULL == pWDA)||(NULL == pFrmBuf))
{
@@ -13509,6 +13537,7 @@
}
return VOS_STATUS_E_FAILURE;
}
+ time_snapshot = vos_timer_get_system_time();
/*
* Wait for the event to be set by the TL, to get the response of TX
* complete, this event should be set by the Callback function called by TL
@@ -13539,6 +13568,8 @@
pCompFunc(VOS_GET_MAC_CTXT(pWDA->pVosContext), (vos_pkt_t *)pFrmBuf);
} */
+ WLANTL_TLDebugMessage(WLANTL_DEBUG_FW_CLEANUP);
+
if( pAckTxComp )
{
pWDA->pAckTxCbFunc = NULL;
@@ -13549,8 +13580,19 @@
"Tx Complete timeout Timer Stop Failed ");
}
}
+ pWDA->mgmtTxfailureCnt++;
+
+ /* SSR if timeout continously for
+ * WDA_TX_FAILURE_RECOVERY_THRESHOLD times.
+ */
+ if (WDA_TX_FAILURE_RECOVERY_THRESHOLD ==
+ pWDA->mgmtTxfailureCnt)
+ {
+ vos_wlanRestart();
+ }
status = VOS_STATUS_E_FAILURE;
}
+
#ifdef WLAN_DUMP_MGMTFRAMES
if (VOS_IS_STATUS_SUCCESS(status))
{
@@ -13563,6 +13605,15 @@
if (VOS_IS_STATUS_SUCCESS(status))
{
+ pWDA->mgmtTxfailureCnt = 0;
+ if ((vos_timer_get_system_time() - time_snapshot) >=
+ WDA_TX_TIME_THRESHOLD)
+ {
+ VOS_TRACE(VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
+ "Tx Complete took %lu ms",
+ vos_timer_get_system_time() - time_snapshot);
+ }
+
if (pMac->fEnableDebugLog & 0x1)
{
if ((pFc->type == SIR_MAC_MGMT_FRAME) &&
diff --git a/CORE/WDI/CP/src/wlan_qct_wdi.c b/CORE/WDI/CP/src/wlan_qct_wdi.c
index 05812a1..2d4f7b2 100644
--- a/CORE/WDI/CP/src/wlan_qct_wdi.c
+++ b/CORE/WDI/CP/src/wlan_qct_wdi.c
@@ -16389,7 +16389,7 @@
wdiStatus = WDI_HAL_2_WDI_STATUS(halInitScanRspMsg.initScanRspParams.status);
- if ( pWDICtx->bInBmps )
+ if (pWDICtx->bInBmps && (WDI_STATUS_SUCCESS == wdiStatus))
{
// notify DTS that we are entering Full power
wptStatus = WDTS_SetPowerState(pWDICtx, WDTS_POWER_STATE_FULL, NULL);
@@ -16399,6 +16399,12 @@
WDI_ASSERT(0);
}
}
+ else
+ {
+ WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_ERROR,
+ "Error returned WDI_ProcessInitScanRspi:%d BMPS%d",
+ wdiStatus, pWDICtx->bInBmps);
+ }
/*Notify UMAC*/
wdiInitScanRspCb( wdiStatus, pWDICtx->pRspCBUserData);