prima: ioctl enable or disable 20/40 bss coex IE in TDLS setup Req/Rsp
This commit implements a private ioctl to enable or disable 20/40
bss coexistence IE in tdls setup frames.
CRs-Fixed: 822849
Change-Id: Icffe4d1dc99ad755d23e8e4e677dc546eff36b86
diff --git a/CORE/MAC/src/pe/lim/limApi.c b/CORE/MAC/src/pe/lim/limApi.c
index ed18255..29df5f7 100644
--- a/CORE/MAC/src/pe/lim/limApi.c
+++ b/CORE/MAC/src/pe/lim/limApi.c
@@ -352,6 +352,8 @@
pMac->lim.probeCounter = 0;
pMac->lim.maxProbe = 0;
pMac->lim.txBdToken = 0;
+
+ pMac->lim.EnableTdls2040BSSCoexIE = 1;
}
static void __limInitAssocVars(tpAniSirGlobal pMac)
diff --git a/CORE/MAC/src/pe/lim/limProcessMessageQueue.c b/CORE/MAC/src/pe/lim/limProcessMessageQueue.c
index 08c07a1..45444d0 100644
--- a/CORE/MAC/src/pe/lim/limProcessMessageQueue.c
+++ b/CORE/MAC/src/pe/lim/limProcessMessageQueue.c
@@ -2339,6 +2339,12 @@
limProcessMlmSpoofMacAddrRsp(pMac, (tSirRetStatus)limMsg->bodyval);
break;
+ case eWNI_SME_SET_TDLS_2040_BSSCOEX_REQ:
+ limProcessSmeSetTdls2040BSSCoexReq(pMac, limMsg->bodyptr);
+ vos_mem_free((v_VOID_t*)limMsg->bodyptr);
+ limMsg->bodyptr = NULL;
+ break;
+
default:
vos_mem_free((v_VOID_t*)limMsg->bodyptr);
limMsg->bodyptr = NULL;
diff --git a/CORE/MAC/src/pe/lim/limProcessTdls.c b/CORE/MAC/src/pe/lim/limProcessTdls.c
index 68c4258..1ef6377 100644
--- a/CORE/MAC/src/pe/lim/limProcessTdls.c
+++ b/CORE/MAC/src/pe/lim/limProcessTdls.c
@@ -1141,11 +1141,14 @@
&tdlsDisRsp.SuppChannels,
&tdlsDisRsp.SuppOperatingClasses);
- if ( 1 == pMac->lim.gLimTDLSOffChannelEnabled &&
- ( pMac->roam.configParam.bandCapability != eCSR_BAND_24) )
+ if (TRUE == pMac->lim.EnableTdls2040BSSCoexIE)
{
- tdlsDisRsp.HT2040BSSCoexistence.present = 1;
- tdlsDisRsp.HT2040BSSCoexistence.infoRequest = 1;
+ if ( 1 == pMac->lim.gLimTDLSOffChannelEnabled &&
+ ( pMac->roam.configParam.bandCapability != eCSR_BAND_24) )
+ {
+ tdlsDisRsp.HT2040BSSCoexistence.present = 1;
+ tdlsDisRsp.HT2040BSSCoexistence.infoRequest = 1;
+ }
}
/*
* now we pack it. First, how much space are we going to need?
@@ -1457,11 +1460,14 @@
&tdlsSetupReq.SuppChannels,
&tdlsSetupReq.SuppOperatingClasses);
- if ( 1 == pMac->lim.gLimTDLSOffChannelEnabled &&
- ( pMac->roam.configParam.bandCapability != eCSR_BAND_24))
+ if (TRUE == pMac->lim.EnableTdls2040BSSCoexIE)
{
- tdlsSetupReq.HT2040BSSCoexistence.present = 1;
- tdlsSetupReq.HT2040BSSCoexistence.infoRequest = 1;
+ if ( 1 == pMac->lim.gLimTDLSOffChannelEnabled &&
+ ( pMac->roam.configParam.bandCapability != eCSR_BAND_24))
+ {
+ tdlsSetupReq.HT2040BSSCoexistence.present = 1;
+ tdlsSetupReq.HT2040BSSCoexistence.infoRequest = 1;
+ }
}
/*
@@ -1911,11 +1917,14 @@
tdlsSetupRsp.Status.status = setupStatus ;
- if ( 1 == pMac->lim.gLimTDLSOffChannelEnabled &&
- ( pMac->roam.configParam.bandCapability != eCSR_BAND_24))
+ if (TRUE == pMac->lim.EnableTdls2040BSSCoexIE)
{
- tdlsSetupRsp.HT2040BSSCoexistence.present = 1;
- tdlsSetupRsp.HT2040BSSCoexistence.infoRequest = 1;
+ if ( 1 == pMac->lim.gLimTDLSOffChannelEnabled &&
+ ( pMac->roam.configParam.bandCapability != eCSR_BAND_24))
+ {
+ tdlsSetupRsp.HT2040BSSCoexistence.present = 1;
+ tdlsSetupRsp.HT2040BSSCoexistence.infoRequest = 1;
+ }
}
/*
* now we pack it. First, how much space are we going to need?
@@ -2109,11 +2118,14 @@
PopulateDot11fHTInfo( pMac, &tdlsSetupCnf.HTInfo, psessionEntry );
}
- if ( 1 == pMac->lim.gLimTDLSOffChannelEnabled &&
- ( pMac->roam.configParam.bandCapability != eCSR_BAND_24))
+ if (TRUE == pMac->lim.EnableTdls2040BSSCoexIE)
{
- tdlsSetupCnf.HT2040BSSCoexistence.present = 1;
- tdlsSetupCnf.HT2040BSSCoexistence.infoRequest = 1;
+ if ( 1 == pMac->lim.gLimTDLSOffChannelEnabled &&
+ ( pMac->roam.configParam.bandCapability != eCSR_BAND_24))
+ {
+ tdlsSetupCnf.HT2040BSSCoexistence.present = 1;
+ tdlsSetupCnf.HT2040BSSCoexistence.infoRequest = 1;
+ }
}
/*
@@ -6251,3 +6263,23 @@
return eSIR_FAILURE;
}
+/*
+ * Set 20_40 BSS Coex IE in TDLS frames.
+ */
+tSirRetStatus limProcessSmeSetTdls2040BSSCoexReq(tpAniSirGlobal pMac,
+ tANI_U32 *pMsgBuf)
+{
+ tAniSetTdls2040BSSCoex *pmsg = NULL;
+ pmsg = (tAniSetTdls2040BSSCoex*) pMsgBuf ;
+
+ if (NULL != pmsg) {
+ pMac->lim.EnableTdls2040BSSCoexIE = pmsg->SetTdls2040BSSCoex;
+ }
+ VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_INFO,
+ "%s: 20_40 BSS Coex IE in TDLS frames "
+ "pMac->lim.EnableTdls2040BSSCoexIE %d ", __func__,
+ pMac->lim.EnableTdls2040BSSCoexIE);
+
+ return eSIR_SUCCESS;
+}
+
diff --git a/CORE/MAC/src/pe/lim/limTypes.h b/CORE/MAC/src/pe/lim/limTypes.h
index 7b15b9e..e504441 100644
--- a/CORE/MAC/src/pe/lim/limTypes.h
+++ b/CORE/MAC/src/pe/lim/limTypes.h
@@ -1114,5 +1114,7 @@
int limProcessRemainOnChnlReq(tpAniSirGlobal pMac, tANI_U32 *pMsg);
void limRemainOnChnRsp(tpAniSirGlobal pMac, eHalStatus status, tANI_U32 *data);
void limProcessMlmSpoofMacAddrRsp(tpAniSirGlobal pMac, tSirRetStatus rspStatus);
+tSirRetStatus limProcessSmeSetTdls2040BSSCoexReq(tpAniSirGlobal pMac,
+ tANI_U32 *pMsgBuf);
#endif /* __LIM_TYPES_H */