wlan: Constify the mac_address param
As the mac_address is supposed no need to be changed.
For those interfaces that need to change the mac_address,
have to make a copy itself.
Change-Id: I28d664efcf1ad901a1dcce1d5a0e4b7f223724f4
CRs-fixed: 882885
diff --git a/CORE/SAP/inc/sapApi.h b/CORE/SAP/inc/sapApi.h
index f8d1bec..93f1f7c 100644
--- a/CORE/SAP/inc/sapApi.h
+++ b/CORE/SAP/inc/sapApi.h
@@ -1003,7 +1003,12 @@
VOS_STATUS
WLANSAP_DisassocSta
(
- v_PVOID_t pvosGCtx, v_U8_t *pPeerStaMac
+ v_PVOID_t pvosGCtx,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0))
+ const v_U8_t *pPeerStaMac
+#else
+ v_U8_t *pPeerStaMac
+#endif
);
/*==========================================================================
diff --git a/CORE/SAP/src/sapModule.c b/CORE/SAP/src/sapModule.c
index ceb8a63..a1d9071 100644
--- a/CORE/SAP/src/sapModule.c
+++ b/CORE/SAP/src/sapModule.c
@@ -1226,7 +1226,11 @@
WLANSAP_DisassocSta
(
v_PVOID_t pvosGCtx,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0))
+ const v_U8_t *pPeerStaMac
+#else
v_U8_t *pPeerStaMac
+#endif
)
{
ptSapContext pSapCtx = VOS_GET_SAP_CB(pvosGCtx);
diff --git a/CORE/SME/inc/smeInside.h b/CORE/SME/inc/smeInside.h
index 3329d3f..c86dbf1 100644
--- a/CORE/SME/inc/smeInside.h
+++ b/CORE/SME/inc/smeInside.h
@@ -300,7 +300,11 @@
eHalStatus csrTdlsSendMgmtReq(tHalHandle hHal, tANI_U8 sessionId, tCsrTdlsSendMgmt *tdlsSendMgmt);
VOS_STATUS csrTdlsSendLinkEstablishParams(tHalHandle hHal,
tANI_U8 sessionId,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0))
+ const tSirMacAddr peerMac,
+#else
tSirMacAddr peerMac,
+#endif
tCsrTdlsLinkEstablishParams *tdlsLinkEstablishParams);
eHalStatus csrTdlsAddPeerSta(tHalHandle hHal, tANI_U8 sessionId,
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0))
@@ -316,7 +320,13 @@
tSirMacAddr peerMac,
#endif
tCsrStaParams *pstaParams);
-eHalStatus csrTdlsDelPeerSta(tHalHandle hHal, tANI_U8 sessionId, tSirMacAddr peerMac);
+eHalStatus csrTdlsDelPeerSta(tHalHandle hHal, tANI_U8 sessionId,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0))
+ const tSirMacAddr peerMac
+#else
+ tSirMacAddr peerMac
+#endif
+ );
eHalStatus csrTdlsProcessCmd(tpAniSirGlobal pMac,tSmeCmd *pCommand );
eHalStatus csrTdlsProcessLinkEstablish( tpAniSirGlobal pMac, tSmeCmd *cmd );
eHalStatus csrTdlsProcessChanSwitchReq(tpAniSirGlobal pMac, tSmeCmd *cmd ); //tdlsoffchan
diff --git a/CORE/SME/inc/sme_Api.h b/CORE/SME/inc/sme_Api.h
index 5a52661..9003b80 100644
--- a/CORE/SME/inc/sme_Api.h
+++ b/CORE/SME/inc/sme_Api.h
@@ -854,7 +854,13 @@
\param pPeerMacAddr - Caller allocated memory filled with peer MAC address (6 bytes)
\return eHalStatus SUCCESS Roam callback will be called to indicate actual results
-------------------------------------------------------------------------------*/
-eHalStatus sme_RoamDisconnectSta(tHalHandle hHal, tANI_U8 sessionId, tANI_U8 *pPeerMacAddr);
+eHalStatus sme_RoamDisconnectSta(tHalHandle hHal, tANI_U8 sessionId,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0))
+ const tANI_U8 *pPeerMacAddr
+#else
+ tANI_U8 *pPeerMacAddr
+#endif
+ );
/* ---------------------------------------------------------------------------
\fn sme_RoamDeauthSta
@@ -3243,9 +3249,13 @@
-------------------------------------------------------------------------*/
VOS_STATUS sme_SendTdlsLinkEstablishParams(tHalHandle hHal,
- tANI_U8 sessionId,
- tSirMacAddr peerMac,
- tCsrTdlsLinkEstablishParams *tdlsLinkEstablishParams);
+ tANI_U8 sessionId,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0))
+ const tSirMacAddr peerMac,
+#else
+ tSirMacAddr peerMac,
+#endif
+ tCsrTdlsLinkEstablishParams *tdlsLinkEstablishParams);
/* ---------------------------------------------------------------------------
\fn sme_SendTdlsMgmtFrame
@@ -3261,8 +3271,15 @@
\param responder - Tdls request type
\- return VOS_STATUS_SUCCES
-------------------------------------------------------------------------*/
-VOS_STATUS sme_SendTdlsMgmtFrame(tHalHandle hHal, tANI_U8 sessionId, tSirMacAddr peerMac,
- tANI_U8 frame_type, tANI_U8 dialog, tANI_U16 status, tANI_U32 peerCapability, tANI_U8 *buf, tANI_U8 len, tANI_U8 responder);
+VOS_STATUS sme_SendTdlsMgmtFrame(tHalHandle hHal, tANI_U8 sessionId,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0))
+ const tSirMacAddr peerMac,
+#else
+ tSirMacAddr peerMac,
+#endif
+ tANI_U8 frame_type, tANI_U8 dialog,
+ tANI_U16 status, tANI_U32 peerCapability,
+ tANI_U8 *buf, tANI_U8 len, tANI_U8 responder);
/* ---------------------------------------------------------------------------
\fn sme_ChangeTdlsPeerSta
\brief API to Update TDLS peer sta parameters.
@@ -3299,7 +3316,13 @@
\param peerMac - peer's Mac Adress.
\- return VOS_STATUS_SUCCES
-------------------------------------------------------------------------*/
-VOS_STATUS sme_DeleteTdlsPeerSta(tHalHandle hHal, tANI_U8 sessionId, tSirMacAddr peerMac);
+VOS_STATUS sme_DeleteTdlsPeerSta(tHalHandle hHal, tANI_U8 sessionId,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0))
+ const tSirMacAddr peerMac
+#else
+ tSirMacAddr peerMac
+#endif
+ );
/* ---------------------------------------------------------------------------
\fn sme_SetTdlsPowerSaveProhibited
\API to set/reset the isTdlsPowerSaveProhibited.
diff --git a/CORE/SME/src/csr/csrApiRoam.c b/CORE/SME/src/csr/csrApiRoam.c
index 8c84356..5f89de3 100644
--- a/CORE/SME/src/csr/csrApiRoam.c
+++ b/CORE/SME/src/csr/csrApiRoam.c
@@ -2795,8 +2795,12 @@
\return eHalStatus
---------------------------------------------------------------------------*/
eHalStatus csrRoamIssueDisassociateStaCmd( tpAniSirGlobal pMac,
- tANI_U32 sessionId,
+ tANI_U32 sessionId,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0))
+ const tANI_U8 *pPeerMacAddr,
+#else
tANI_U8 *pPeerMacAddr,
+#endif
tANI_U32 reason)
{
eHalStatus status = eHAL_STATUS_SUCCESS;
diff --git a/CORE/SME/src/csr/csrInsideApi.h b/CORE/SME/src/csr/csrInsideApi.h
index 0a81326..885fc33 100644
--- a/CORE/SME/src/csr/csrInsideApi.h
+++ b/CORE/SME/src/csr/csrInsideApi.h
@@ -920,8 +920,12 @@
\return eHalStatus
---------------------------------------------------------------------------*/
eHalStatus csrRoamIssueDisassociateStaCmd( tpAniSirGlobal pMac,
- tANI_U32 sessionId,
+ tANI_U32 sessionId,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0))
+ const tANI_U8 *pPeerMacAddr,
+#else
tANI_U8 *pPeerMacAddr,
+#endif
tANI_U32 reason);
/* ---------------------------------------------------------------------------
diff --git a/CORE/SME/src/csr/csrTdlsProcess.c b/CORE/SME/src/csr/csrTdlsProcess.c
index b670225..757199c 100644
--- a/CORE/SME/src/csr/csrTdlsProcess.c
+++ b/CORE/SME/src/csr/csrTdlsProcess.c
@@ -233,9 +233,13 @@
* TDLS request API, called from HDD to Send Link Establishment Parameters
*/
VOS_STATUS csrTdlsSendLinkEstablishParams(tHalHandle hHal,
- tANI_U8 sessionId,
- tSirMacAddr peerMac,
- tCsrTdlsLinkEstablishParams *tdlsLinkEstablishParams)
+ tANI_U8 sessionId,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0))
+ const tSirMacAddr peerMac,
+#else
+ tSirMacAddr peerMac,
+#endif
+ tCsrTdlsLinkEstablishParams *tdlsLinkEstablishParams)
{
tpAniSirGlobal pMac = PMAC_STRUCT( hHal );
tSmeCmd *tdlsLinkEstablishCmd;
@@ -341,7 +345,13 @@
/*
* TDLS request API, called from HDD to delete a TDLS peer
*/
-eHalStatus csrTdlsDelPeerSta(tHalHandle hHal, tANI_U8 sessionId, tSirMacAddr peerMac)
+eHalStatus csrTdlsDelPeerSta(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 *tdlsDelStaCmd ;
diff --git a/CORE/SME/src/sme_common/sme_Api.c b/CORE/SME/src/sme_common/sme_Api.c
index 01db3fa..c7ab28f 100644
--- a/CORE/SME/src/sme_common/sme_Api.c
+++ b/CORE/SME/src/sme_common/sme_Api.c
@@ -3603,7 +3603,12 @@
\return eHalStatus SUCCESS Roam callback will be called to indicate actual results
-------------------------------------------------------------------------------*/
eHalStatus sme_RoamDisconnectSta(tHalHandle hHal, tANI_U8 sessionId,
- tANI_U8 *pPeerMacAddr)
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0))
+ const tANI_U8 *pPeerMacAddr
+#else
+ tANI_U8 *pPeerMacAddr
+#endif
+)
{
eHalStatus status = eHAL_STATUS_FAILURE;
tpAniSirGlobal pMac = PMAC_STRUCT( hHal );
@@ -10534,9 +10539,13 @@
\- return VOS_STATUS_SUCCES
-------------------------------------------------------------------------*/
VOS_STATUS sme_SendTdlsLinkEstablishParams(tHalHandle hHal,
- tANI_U8 sessionId,
- tSirMacAddr peerMac,
- tCsrTdlsLinkEstablishParams *tdlsLinkEstablishParams)
+ tANI_U8 sessionId,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0))
+ const tSirMacAddr peerMac,
+#else
+ tSirMacAddr peerMac,
+#endif
+ tCsrTdlsLinkEstablishParams *tdlsLinkEstablishParams)
{
eHalStatus status = eHAL_STATUS_SUCCESS;
tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
@@ -10603,8 +10612,15 @@
\param responder - Tdls request type
\- return VOS_STATUS_SUCCES
-------------------------------------------------------------------------*/
-VOS_STATUS sme_SendTdlsMgmtFrame(tHalHandle hHal, tANI_U8 sessionId, tSirMacAddr peerMac,
- tANI_U8 frame_type, tANI_U8 dialog, tANI_U16 statusCode, tANI_U32 peerCapability, tANI_U8 *buf, tANI_U8 len, tANI_U8 responder)
+VOS_STATUS sme_SendTdlsMgmtFrame(tHalHandle hHal, tANI_U8 sessionId,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0))
+ const tSirMacAddr peerMac,
+#else
+ tSirMacAddr peerMac,
+#endif
+ tANI_U8 frame_type, tANI_U8 dialog,
+ tANI_U16 statusCode, tANI_U32 peerCapability,
+ tANI_U8 *buf, tANI_U8 len, tANI_U8 responder)
{
eHalStatus status = eHAL_STATUS_SUCCESS;
tCsrTdlsSendMgmt sendTdlsReq = {{0}} ;
@@ -10713,7 +10729,13 @@
\param peerMac - peer's Mac Adress.
\- return VOS_STATUS_SUCCES
-------------------------------------------------------------------------*/
-VOS_STATUS sme_DeleteTdlsPeerSta(tHalHandle hHal, tANI_U8 sessionId, tSirMacAddr peerMac)
+VOS_STATUS sme_DeleteTdlsPeerSta(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);