Commit 4d17363d authored by Andreas Hellmich's avatar Andreas Hellmich Committed by Greg Kroah-Hartman
parent 68468503
...@@ -207,10 +207,10 @@ static RT_CHANNEL_PLAN_MAP RTW_ChannelPlanMap[RT_CHANNEL_DOMAIN_MAX] = { ...@@ -207,10 +207,10 @@ static RT_CHANNEL_PLAN_MAP RTW_ChannelPlanMap[RT_CHANNEL_DOMAIN_MAX] = {
{0x02, 0x1F}, /* 0x57, RT_CHANNEL_DOMAIN_FCC1_FCC10 */ {0x02, 0x1F}, /* 0x57, RT_CHANNEL_DOMAIN_FCC1_FCC10 */
}; };
static RT_CHANNEL_PLAN_MAP RTW_CHANNEL_PLAN_MAP_REALTEK_DEFINE = {0x03, 0x02}; /* use the combination for max channel numbers */ /* use the combination for max channel numbers */
static RT_CHANNEL_PLAN_MAP RTW_CHANNEL_PLAN_MAP_REALTEK_DEFINE = {0x03, 0x02};
/* /* Search the @param ch in given @param ch_set
* Search the @param ch in given @param ch_set
* @ch_set: the given channel set * @ch_set: the given channel set
* @ch: the given channel number * @ch: the given channel number
* *
...@@ -229,8 +229,7 @@ int rtw_ch_set_search_ch(RT_CHANNEL_INFO *ch_set, const u32 ch) ...@@ -229,8 +229,7 @@ int rtw_ch_set_search_ch(RT_CHANNEL_INFO *ch_set, const u32 ch)
return i; return i;
} }
/* /* Check the @param ch is fit with setband setting of @param adapter
* Check the @param ch is fit with setband setting of @param adapter
* @adapter: the given adapter * @adapter: the given adapter
* @ch: the given channel number * @ch: the given channel number
* *
...@@ -3356,9 +3355,11 @@ void issue_assocreq(struct adapter *padapter) ...@@ -3356,9 +3355,11 @@ void issue_assocreq(struct adapter *padapter)
(!memcmp(pIE->data, WPS_OUI, 4))) { (!memcmp(pIE->data, WPS_OUI, 4))) {
vs_ie_length = pIE->Length; vs_ie_length = pIE->Length;
if ((!padapter->registrypriv.wifi_spec) && (!memcmp(pIE->data, WPS_OUI, 4))) { if ((!padapter->registrypriv.wifi_spec) && (!memcmp(pIE->data, WPS_OUI, 4))) {
/* Commented by Kurt 20110629 */ /* Commented by Kurt 20110629
/* In some older APs, WPS handshake */ * In some older APs, WPS handshake
/* would be fail if we append vender extensions information to AP */ * would be fail if we append vendor
* extensions information to AP
*/
vs_ie_length = 14; vs_ie_length = 14;
} }
...@@ -5379,8 +5380,7 @@ static void rtw_mlmeext_disconnect(struct adapter *padapter) ...@@ -5379,8 +5380,7 @@ static void rtw_mlmeext_disconnect(struct adapter *padapter)
/* set_opmode_cmd(padapter, infra_client_with_mlme); */ /* set_opmode_cmd(padapter, infra_client_with_mlme); */
/* /* For safety, prevent from keeping macid sleep.
* For safety, prevent from keeping macid sleep.
* If we can sure all power mode enter/leave are paired, * If we can sure all power mode enter/leave are paired,
* this check can be removed. * this check can be removed.
* Lucas@20131113 * Lucas@20131113
...@@ -6385,7 +6385,9 @@ u8 sitesurvey_cmd_hdl(struct adapter *padapter, u8 *pbuf) ...@@ -6385,7 +6385,9 @@ u8 sitesurvey_cmd_hdl(struct adapter *padapter, u8 *pbuf)
Save_DM_Func_Flag(padapter); Save_DM_Func_Flag(padapter);
Switch_DM_Func(padapter, DYNAMIC_FUNC_DISABLE, false); Switch_DM_Func(padapter, DYNAMIC_FUNC_DISABLE, false);
/* config the initial gain under scanning, need to write the BB registers */ /* config the initial gain under scanning, need to write the BB
* registers
*/
initialgain = 0x1e; initialgain = 0x1e;
rtw_hal_set_hwreg(padapter, HW_VAR_INITIAL_GAIN, (u8 *)(&initialgain)); rtw_hal_set_hwreg(padapter, HW_VAR_INITIAL_GAIN, (u8 *)(&initialgain));
......
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/****************************************************************************** /*****************************************************************************
* *
* Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved.
* *
...@@ -82,7 +82,9 @@ static void setIqkMatrix_8723B( ...@@ -82,7 +82,9 @@ static void setIqkMatrix_8723B(
/* if (RFPath == ODM_RF_PATH_A) */ /* if (RFPath == ODM_RF_PATH_A) */
switch (RFPath) { switch (RFPath) {
case ODM_RF_PATH_A: case ODM_RF_PATH_A:
/* write new elements A, C, D to regC80 and regC94, element B is always 0 */ /* write new elements A, C, D to regC80 and regC94,
* element B is always 0
*/
value32 = (ele_D<<22)|((ele_C&0x3F)<<16)|ele_A; value32 = (ele_D<<22)|((ele_C&0x3F)<<16)|ele_A;
PHY_SetBBReg(pDM_Odm->Adapter, rOFDM0_XATxIQImbalance, bMaskDWord, value32); PHY_SetBBReg(pDM_Odm->Adapter, rOFDM0_XATxIQImbalance, bMaskDWord, value32);
...@@ -93,7 +95,9 @@ static void setIqkMatrix_8723B( ...@@ -93,7 +95,9 @@ static void setIqkMatrix_8723B(
PHY_SetBBReg(pDM_Odm->Adapter, rOFDM0_ECCAThreshold, BIT24, value32); PHY_SetBBReg(pDM_Odm->Adapter, rOFDM0_ECCAThreshold, BIT24, value32);
break; break;
case ODM_RF_PATH_B: case ODM_RF_PATH_B:
/* write new elements A, C, D to regC88 and regC9C, element B is always 0 */ /* write new elements A, C, D to regC88 and regC9C,
* element B is always 0
*/
value32 = (ele_D<<22)|((ele_C&0x3F)<<16)|ele_A; value32 = (ele_D<<22)|((ele_C&0x3F)<<16)|ele_A;
PHY_SetBBReg(pDM_Odm->Adapter, rOFDM0_XBTxIQImbalance, bMaskDWord, value32); PHY_SetBBReg(pDM_Odm->Adapter, rOFDM0_XBTxIQImbalance, bMaskDWord, value32);
......
...@@ -3191,22 +3191,26 @@ static void rtl8723b_fill_default_txdesc( ...@@ -3191,22 +3191,26 @@ static void rtl8723b_fill_default_txdesc(
if (bmcst) if (bmcst)
ptxdesc->bmc = 1; ptxdesc->bmc = 1;
/* 2009.11.05. tynli_test. Suggested by SD4 Filen for FW LPS. */ /* 2009.11.05. tynli_test. Suggested by SD4 Filen for FW LPS.
/* (1) The sequence number of each non-Qos frame / broadcast / multicast / */ * (1) The sequence number of each non-Qos frame / broadcast /
/* mgnt frame should be controlled by Hw because Fw will also send null data */ * multicast / mgnt frame should be controlled by Hw because Fw
/* which we cannot control when Fw LPS enable. */ * will also send null data which we cannot control when Fw LPS
/* --> default enable non-Qos data sequense number. 2010.06.23. by tynli. */ * enable.
/* (2) Enable HW SEQ control for beacon packet, because we use Hw beacon. */ * --> default enable non-Qos data sequense number. 2010.06.23.
/* (3) Use HW Qos SEQ to control the seq num of Ext port non-Qos packets. */ * by tynli.
/* 2010.06.23. Added by tynli. */ * (2) Enable HW SEQ control for beacon packet, because we use
* Hw beacon.
* (3) Use HW Qos SEQ to control the seq num of Ext port non-Qos
* packets.
* 2010.06.23. Added by tynli.
*/
if (!pattrib->qos_en) /* Hw set sequence number */ if (!pattrib->qos_en) /* Hw set sequence number */
ptxdesc->en_hwseq = 1; /* HWSEQ_EN */ ptxdesc->en_hwseq = 1; /* HWSEQ_EN */
} }
/* /* Description:
*Description:
* *
*Parameters: * Parameters:
* pxmitframe xmitframe * pxmitframe xmitframe
* pbuf where to fill tx desc * pbuf where to fill tx desc
*/ */
...@@ -4329,8 +4333,7 @@ void GetHwReg8723B(struct adapter *padapter, u8 variable, u8 *val) ...@@ -4329,8 +4333,7 @@ void GetHwReg8723B(struct adapter *padapter, u8 variable, u8 *val)
} }
} }
/* /* Description:
*Description:
* Change default setting of specified variable. * Change default setting of specified variable.
*/ */
u8 SetHalDefVar8723B(struct adapter *padapter, enum HAL_DEF_VARIABLE variable, void *pval) u8 SetHalDefVar8723B(struct adapter *padapter, enum HAL_DEF_VARIABLE variable, void *pval)
...@@ -4348,8 +4351,7 @@ u8 SetHalDefVar8723B(struct adapter *padapter, enum HAL_DEF_VARIABLE variable, v ...@@ -4348,8 +4351,7 @@ u8 SetHalDefVar8723B(struct adapter *padapter, enum HAL_DEF_VARIABLE variable, v
return bResult; return bResult;
} }
/* /* Description:
*Description:
* Query setting of specified variable. * Query setting of specified variable.
*/ */
u8 GetHalDefVar8723B(struct adapter *padapter, enum HAL_DEF_VARIABLE variable, void *pval) u8 GetHalDefVar8723B(struct adapter *padapter, enum HAL_DEF_VARIABLE variable, void *pval)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment