TDLS: Introduce TDLS_MGMT_VERSION2 to interop with updated tdls_mgmt.
tdls_mgmt callback function in cfg80211 is enhanced to also include
the peer capability information which shall be passed by the supplicant.
To ensure the host driver interops with the both versions of tdls_mgmt
implementation,a flag TDLS_MGMT_VERSION2 is defined in the kernel.
Enhance the driver to rely on this flag and thus use the respective
tdls_mgmt callback functionality.
CRs-Fixed: 605665
Change-Id: Ic2dca6b54dcc754837eb6bdf1f4d2b05fbebb08d
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index fcff9ad..eb92606 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -8690,9 +8690,15 @@
#ifdef FEATURE_WLAN_TDLS
+#if TDLS_MGMT_VERSION2
static int wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy, struct net_device *dev,
u8 *peer, u8 action_code, u8 dialog_token,
- u16 status_code, const u8 *buf, size_t len)
+ u16 status_code, u32 peer_capability, const u8 *buf, size_t len)
+#else
+static int wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy, struct net_device *dev,
+ u8 *peer, u8 action_code, u8 dialog_token,
+ u16 status_code, const u8 *buf, size_t len)
+#endif
{
hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
@@ -8702,6 +8708,9 @@
int max_sta_failed = 0;
int responder;
long rc;
+#if !(TDLS_MGMT_VERSION2)
+ u32 peer_capability = 0;
+#endif
MTRACE(vos_trace(VOS_MODULE_ID_HDD,
TRACE_CODE_HDD_CFG80211_TDLS_MGMT,
@@ -9181,8 +9190,13 @@
"tdls send discover req: "MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(peer));
+#if TDLS_MGMT_VERSION2
+ return wlan_hdd_cfg80211_tdls_mgmt(wiphy, dev, peer,
+ WLAN_TDLS_DISCOVERY_REQUEST, 1, 0, 0, NULL, 0);
+#else
return wlan_hdd_cfg80211_tdls_mgmt(wiphy, dev, peer,
WLAN_TDLS_DISCOVERY_REQUEST, 1, 0, NULL, 0);
+#endif
}
#endif