staging: rtl8723bs: Fix line length (4d17363d) · Commits · 戴 / test

drivers/staging/rtl8723bs/core/rtw_mlme_ext.c

+13 −11

Original line number	Diff line number	Diff line
		@@ -207,10 +207,10 @@ static RT_CHANNEL_PLAN_MAP RTW_ChannelPlanMap[RT_CHANNEL_DOMAIN_MAX] = {
		{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: the given channel number
		*
		@@ -229,8 +229,7 @@ int rtw_ch_set_search_ch(RT_CHANNEL_INFO *ch_set, const u32 ch)
		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
		* @ch: the given channel number
		*
		@@ -3356,9 +3355,11 @@ void issue_assocreq(struct adapter *padapter)
		(!memcmp(pIE->data, WPS_OUI, 4))) {
		vs_ie_length = pIE->Length;
		if ((!padapter->registrypriv.wifi_spec) && (!memcmp(pIE->data, WPS_OUI, 4))) {
		/* Commented by Kurt 20110629 */
		/* In some older APs, WPS handshake */
		/* would be fail if we append vender extensions information to AP */
		/* Commented by Kurt 20110629
		* In some older APs, WPS handshake
		* would be fail if we append vendor
		* extensions information to AP
		*/

		vs_ie_length = 14;
		}
		@@ -5379,8 +5380,7 @@ static void rtw_mlmeext_disconnect(struct adapter *padapter)

		/* 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,
		* this check can be removed.
		* Lucas@20131113
		@@ -6385,7 +6385,9 @@ u8 sitesurvey_cmd_hdl(struct adapter padapter, u8 pbuf)
		Save_DM_Func_Flag(padapter);
		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;

		rtw_hal_set_hwreg(padapter, HW_VAR_INITIAL_GAIN, (u8 *)(&initialgain));

drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c

+7 −3

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0
		/******************************************************************************
		/*****************************************************************************
		*
		* Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved.
		*
		@@ -82,7 +82,9 @@ static void setIqkMatrix_8723B(
		/* if (RFPath == ODM_RF_PATH_A) */
		switch (RFPath) {
		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;
		PHY_SetBBReg(pDM_Odm->Adapter, rOFDM0_XATxIQImbalance, bMaskDWord, value32);

		@@ -93,7 +95,9 @@ static void setIqkMatrix_8723B(
		PHY_SetBBReg(pDM_Odm->Adapter, rOFDM0_ECCAThreshold, BIT24, value32);
		break;
		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;
		PHY_SetBBReg(pDM_Odm->Adapter, rOFDM0_XBTxIQImbalance, bMaskDWord, value32);

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c

+17 −15

Original line number	Diff line number	Diff line
		@@ -3191,20 +3191,24 @@ static void rtl8723b_fill_default_txdesc(
		if (bmcst)
		ptxdesc->bmc = 1;

		/* 2009.11.05. tynli_test. Suggested by SD4 Filen for FW LPS. */
		/* (1) The sequence number of each non-Qos frame / broadcast / multicast / */
		/* mgnt frame should be controlled by Hw because Fw will also send null data */
		/* which we cannot control when Fw LPS enable. */
		/* --> default enable non-Qos data sequense number. 2010.06.23. 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. */
		/* 2009.11.05. tynli_test. Suggested by SD4 Filen for FW LPS.
		* (1) The sequence number of each non-Qos frame / broadcast /
		* multicast / mgnt frame should be controlled by Hw because Fw
		* will also send null data which we cannot control when Fw LPS
		* enable.
		* --> default enable non-Qos data sequense number. 2010.06.23.
		* 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 */
		ptxdesc->en_hwseq = 1; /* HWSEQ_EN */
		}

		/*
		*Description:
		/* Description:
		*
		* Parameters:
		* pxmitframe xmitframe
		@@ -4329,8 +4333,7 @@ void GetHwReg8723B(struct adapter padapter, u8 variable, u8 val)
		}
		}

		/*
		*Description:
		/* Description:
		* Change default setting of specified variable.
		*/
		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
		return bResult;
		}

		/*
		*Description:
		/* Description:
		* Query setting of specified variable.
		*/
		u8 GetHalDefVar8723B(struct adapter padapter, enum HAL_DEF_VARIABLE variable, void pval)

Admin message