net/wireless/rockchip_wlan: fix compile warning

rkhuangtao · rkhuangtao · commit 1dd2b51cdf60 · 2018-02-11T19:21:16.000+08:00
Change-Id: Ife9d64914e2986a07a649064ee0141d83fea69e2
Signed-off-by: Tao Huang &lt;huangtao@rock-chips.com&gt;
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8188fu/core/rtw_mlme_ext.c b/drivers/net/wireless/rockchip_wlan/rtl8188fu/core/rtw_mlme_ext.c
@@ -12248,10 +12248,10 @@ void rtw_delba_check(_adapter *padapter, struct sta_info *psta, u8 from_timer)
 							ret = issue_del_ba_ex(padapter, psta->hwaddr, i, 39, 0, 3, 1);
 						else
 							issue_del_ba(padapter,  psta->hwaddr, i, 39, 0);							
-							psta->recvreorder_ctrl[i].enable = _FALSE;
+						psta->recvreorder_ctrl[i].enable = _FALSE;
 						if (ret != _FAIL)
 							psta->recvreorder_ctrl[i].ampdu_size = RX_AMPDU_SIZE_INVALID;
-							rtw_reset_continual_no_rx_packet(psta, i);
+						rtw_reset_continual_no_rx_packet(psta, i);
 						}				
 					}
 				}
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8188fu/core/rtw_security.c b/drivers/net/wireless/rockchip_wlan/rtl8188fu/core/rtw_security.c
@@ -1598,8 +1598,8 @@ _func_enter_;
     for (j = 0; j < 8; j++)
     	pframe[payload_index+j] = mic[j];	//message[payload_index+j] = mic[j];
 
-	payload_index = hdrlen + 8;
-	for (i=0; i< num_blocks; i++)
+    payload_index = hdrlen + 8;
+    for (i=0; i< num_blocks; i++)
     {
         construct_ctr_preload(
                                 ctr_preload,
@@ -1984,8 +1984,8 @@ _func_enter_;
     for (j = 0; j < 8; j++)
     	message[payload_index+j] = mic[j];
 
-	payload_index = hdrlen + 8;
-	for (i=0; i< num_blocks; i++)
+    payload_index = hdrlen + 8;
+    for (i=0; i< num_blocks; i++)
     {
         construct_ctr_preload(
                                 ctr_preload,
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/rtl8188f/rtl8188f_hal_init.c b/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/rtl8188f/rtl8188f_hal_init.c
@@ -2643,7 +2643,7 @@ hal_EfusePgPacketWrite1ByteHeader(
 	if (IS_HARDWARE_TYPE_8723BE(pAdapter))
 		efuse_OneByteWrite(pAdapter, 0x1FF, 00, FALSE); /* increase current */
 
-		efuse_OneByteWrite(pAdapter, efuse_addr, pg_header, bPseudoTest);
+	efuse_OneByteWrite(pAdapter, efuse_addr, pg_header, bPseudoTest);
 
 	PHY_SetMacReg(pAdapter, EFUSE_TEST, BIT26, 0); 
 
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8189es/core/rtw_iol.c b/drivers/net/wireless/rockchip_wlan/rtl8189es/core/rtw_iol.c
@@ -258,7 +258,8 @@ void rtw_IOL_cmd_buf_dump(ADAPTER *Adapter,int buf_len,u8 *pbuf)
 	for(i=0;i< buf_len;i++){
 		printk("%02x-",*(pbuf+i));
 			
-		if(j%32 ==0) printk("\n");j++;				
+		if(j%32 ==0) printk("\n");
+		j++;
 	}
 	printk("\n");
 	printk("============= ioreg_cmd len = %d =============== \n",buf_len);	
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8189es/core/rtw_mlme_ext.c b/drivers/net/wireless/rockchip_wlan/rtl8189es/core/rtw_mlme_ext.c
@@ -12136,10 +12136,10 @@ void rtw_delba_check(_adapter *padapter, struct sta_info *psta, u8 from_timer)
 							ret = issue_del_ba_ex(padapter, psta->hwaddr, i, 39, 0, 3, 1);
 						else
 							issue_del_ba(padapter,  psta->hwaddr, i, 39, 0);							
-							psta->recvreorder_ctrl[i].enable = _FALSE;
+						psta->recvreorder_ctrl[i].enable = _FALSE;
 						if (ret != _FAIL)
 							psta->recvreorder_ctrl[i].ampdu_size = RX_AMPDU_SIZE_INVALID;
-							rtw_reset_continual_no_rx_packet(psta, i);
+						rtw_reset_continual_no_rx_packet(psta, i);
 						}				
 					}
 				}
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8189es/core/rtw_security.c b/drivers/net/wireless/rockchip_wlan/rtl8189es/core/rtw_security.c
@@ -1598,8 +1598,8 @@ _func_enter_;
     for (j = 0; j < 8; j++)
     	pframe[payload_index+j] = mic[j];	//message[payload_index+j] = mic[j];
 
-	payload_index = hdrlen + 8;
-	for (i=0; i< num_blocks; i++)
+    payload_index = hdrlen + 8;
+    for (i=0; i< num_blocks; i++)
     {
         construct_ctr_preload(
                                 ctr_preload,
@@ -1984,8 +1984,8 @@ _func_enter_;
     for (j = 0; j < 8; j++)
     	message[payload_index+j] = mic[j];
 
-	payload_index = hdrlen + 8;
-	for (i=0; i< num_blocks; i++)
+    payload_index = hdrlen + 8;
+    for (i=0; i< num_blocks; i++)
     {
         construct_ctr_preload(
                                 ctr_preload,
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8189es/os_dep/linux/ioctl_cfg80211.c b/drivers/net/wireless/rockchip_wlan/rtl8189es/os_dep/linux/ioctl_cfg80211.c
@@ -5368,11 +5368,11 @@ static int _cfg80211_rtw_mgmt_tx(_adapter *padapter, u8 tx_ch, const u8 *buf, si
 	}else 
 #endif //CONFIG_CONCURRENT_MODE
 	//if (tx_ch != pmlmeext->cur_channel) {
-	if(tx_ch != rtw_get_oper_ch(padapter)) {
-		if (!check_fwstate(&padapter->mlmepriv, _FW_LINKED ))
-			pmlmeext->cur_channel = tx_ch;
-		set_channel_bwmode(padapter, tx_ch, HAL_PRIME_CHNL_OFFSET_DONT_CARE, CHANNEL_WIDTH_20);
-	}
+		if(tx_ch != rtw_get_oper_ch(padapter)) {
+			if (!check_fwstate(&padapter->mlmepriv, _FW_LINKED ))
+				pmlmeext->cur_channel = tx_ch;
+			set_channel_bwmode(padapter, tx_ch, HAL_PRIME_CHNL_OFFSET_DONT_CARE, CHANNEL_WIDTH_20);
+		}
 
 	//starting alloc mgmt frame to dump it
 	if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL)
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8189fs/core/rtw_mlme_ext.c b/drivers/net/wireless/rockchip_wlan/rtl8189fs/core/rtw_mlme_ext.c
@@ -12153,10 +12153,10 @@ void rtw_delba_check(_adapter *padapter, struct sta_info *psta, u8 from_timer)
 							ret = issue_del_ba_ex(padapter, psta->hwaddr, i, 39, 0, 3, 1);
 						else
 							issue_del_ba(padapter,  psta->hwaddr, i, 39, 0);							
-							psta->recvreorder_ctrl[i].enable = _FALSE;
+						psta->recvreorder_ctrl[i].enable = _FALSE;
 						if (ret != _FAIL)
 							psta->recvreorder_ctrl[i].ampdu_size = RX_AMPDU_SIZE_INVALID;
-							rtw_reset_continual_no_rx_packet(psta, i);
+						rtw_reset_continual_no_rx_packet(psta, i);
 						}				
 					}
 				}
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8189fs/core/rtw_security.c b/drivers/net/wireless/rockchip_wlan/rtl8189fs/core/rtw_security.c
@@ -1598,8 +1598,8 @@ _func_enter_;
     for (j = 0; j < 8; j++)
     	pframe[payload_index+j] = mic[j];	//message[payload_index+j] = mic[j];
 
-	payload_index = hdrlen + 8;
-	for (i=0; i< num_blocks; i++)
+    payload_index = hdrlen + 8;
+    for (i=0; i< num_blocks; i++)
     {
         construct_ctr_preload(
                                 ctr_preload,
@@ -1984,8 +1984,8 @@ _func_enter_;
     for (j = 0; j < 8; j++)
     	message[payload_index+j] = mic[j];
 
-	payload_index = hdrlen + 8;
-	for (i=0; i< num_blocks; i++)
+    payload_index = hdrlen + 8;
+    for (i=0; i< num_blocks; i++)
     {
         construct_ctr_preload(
                                 ctr_preload,
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/rtl8188f/rtl8188f_hal_init.c b/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/rtl8188f/rtl8188f_hal_init.c
@@ -2639,7 +2639,7 @@ hal_EfusePgPacketWrite1ByteHeader(
 	if (IS_HARDWARE_TYPE_8723BE(pAdapter))
 		efuse_OneByteWrite(pAdapter, 0x1FF, 00, FALSE); /* increase current */
 
-		efuse_OneByteWrite(pAdapter, efuse_addr, pg_header, bPseudoTest);
+	efuse_OneByteWrite(pAdapter, efuse_addr, pg_header, bPseudoTest);
 
 	PHY_SetMacReg(pAdapter, EFUSE_TEST, BIT26, 0); 
 
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723bs/core/rtw_mlme_ext.c b/drivers/net/wireless/rockchip_wlan/rtl8723bs/core/rtw_mlme_ext.c
@@ -12217,10 +12217,10 @@ void rtw_delba_check(_adapter *padapter, struct sta_info *psta, u8 from_timer)
 							ret = issue_del_ba_ex(padapter, psta->hwaddr, i, 39, 0, 3, 1);
 						else
 							issue_del_ba(padapter,  psta->hwaddr, i, 39, 0);							
-							psta->recvreorder_ctrl[i].enable = _FALSE;
+						psta->recvreorder_ctrl[i].enable = _FALSE;
 						if (ret != _FAIL)
 							psta->recvreorder_ctrl[i].ampdu_size = RX_AMPDU_SIZE_INVALID;
-							rtw_reset_continual_no_rx_packet(psta, i);
+						rtw_reset_continual_no_rx_packet(psta, i);
 						}				
 					}
 				}
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723bs/core/rtw_security.c b/drivers/net/wireless/rockchip_wlan/rtl8723bs/core/rtw_security.c
@@ -1598,8 +1598,8 @@ _func_enter_;
     for (j = 0; j < 8; j++)
     	pframe[payload_index+j] = mic[j];	//message[payload_index+j] = mic[j];
 
-	payload_index = hdrlen + 8;
-	for (i=0; i< num_blocks; i++)
+    payload_index = hdrlen + 8;
+    for (i=0; i< num_blocks; i++)
     {
         construct_ctr_preload(
                                 ctr_preload,
@@ -1984,8 +1984,8 @@ _func_enter_;
     for (j = 0; j < 8; j++)
     	message[payload_index+j] = mic[j];
 
-	payload_index = hdrlen + 8;
-	for (i=0; i< num_blocks; i++)
+    payload_index = hdrlen + 8;
+    for (i=0; i< num_blocks; i++)
     {
         construct_ctr_preload(
                                 ctr_preload,
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/hal_mp.c b/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/hal_mp.c
@@ -970,6 +970,7 @@ void mpt_SetRFPath_8812A(PADAPTER pAdapter)
 void mpt_SetRFPath_8723B(PADAPTER pAdapter)
 {
 	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(pAdapter);
+	u8		p = 0, i = 0;
 	u32		ulAntennaTx, ulAntennaRx;
 	PMPT_CONTEXT	pMptCtx = &(pAdapter->mppriv.MptCtx);
 	PDM_ODM_T	pDM_Odm = &pHalData->odmpriv;
@@ -984,7 +985,6 @@ void mpt_SetRFPath_8723B(PADAPTER pAdapter)
 	}
 
 	switch (pAdapter->mppriv.antenna_tx) {
-		u8 p = 0, i = 0;
 	case ANTENNA_A: /*/ Actually path S1  (Wi-Fi)*/
 			{
 			pMptCtx->MptRfPath = ODM_RF_PATH_A;			
@@ -1068,6 +1068,7 @@ void mpt_SetRFPath_8723B(PADAPTER pAdapter)
 void mpt_SetRFPath_8703B(PADAPTER pAdapter)
 {
 	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(pAdapter);
+	u1Byte		p = 0, i = 0;
 	u4Byte					ulAntennaTx, ulAntennaRx;
 	PMPT_CONTEXT		pMptCtx = &(pAdapter->mppriv.MptCtx);
 	PDM_ODM_T		pDM_Odm = &pHalData->odmpriv;
@@ -1082,8 +1083,6 @@ void mpt_SetRFPath_8703B(PADAPTER pAdapter)
 	}
 
 	switch (pAdapter->mppriv.antenna_tx) {
-		u1Byte p = 0, i = 0;
-
 	case ANTENNA_A: /* Actually path S1  (Wi-Fi) */
 				{
 				pMptCtx->MptRfPath = ODM_RF_PATH_A;			
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/rtl8723b/rtl8723b_hal_init.c b/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/rtl8723b/rtl8723b_hal_init.c
@@ -2660,7 +2660,7 @@ hal_EfusePgPacketWrite1ByteHeader(
 	if (IS_HARDWARE_TYPE_8723BE(pAdapter))
 		efuse_OneByteWrite(pAdapter, 0x1FF, 00, FALSE); /* increase current */
 
-		efuse_OneByteWrite(pAdapter, efuse_addr, pg_header, bPseudoTest);
+	efuse_OneByteWrite(pAdapter, efuse_addr, pg_header, bPseudoTest);
 
 	PHY_SetMacReg(pAdapter, EFUSE_TEST, BIT26, 0);
 
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723bu/core/rtw_mlme_ext.c b/drivers/net/wireless/rockchip_wlan/rtl8723bu/core/rtw_mlme_ext.c
@@ -12217,10 +12217,10 @@ void rtw_delba_check(_adapter *padapter, struct sta_info *psta, u8 from_timer)
 							ret = issue_del_ba_ex(padapter, psta->hwaddr, i, 39, 0, 3, 1);
 						else
 							issue_del_ba(padapter,  psta->hwaddr, i, 39, 0);							
-							psta->recvreorder_ctrl[i].enable = _FALSE;
+						psta->recvreorder_ctrl[i].enable = _FALSE;
 						if (ret != _FAIL)
 							psta->recvreorder_ctrl[i].ampdu_size = RX_AMPDU_SIZE_INVALID;
-							rtw_reset_continual_no_rx_packet(psta, i);
+						rtw_reset_continual_no_rx_packet(psta, i);
 						}				
 					}
 				}
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723bu/core/rtw_security.c b/drivers/net/wireless/rockchip_wlan/rtl8723bu/core/rtw_security.c
@@ -1598,8 +1598,8 @@ _func_enter_;
     for (j = 0; j < 8; j++)
     	pframe[payload_index+j] = mic[j];	//message[payload_index+j] = mic[j];
 
-	payload_index = hdrlen + 8;
-	for (i=0; i< num_blocks; i++)
+    payload_index = hdrlen + 8;
+    for (i=0; i< num_blocks; i++)
     {
         construct_ctr_preload(
                                 ctr_preload,
@@ -1984,8 +1984,8 @@ _func_enter_;
     for (j = 0; j < 8; j++)
     	message[payload_index+j] = mic[j];
 
-	payload_index = hdrlen + 8;
-	for (i=0; i< num_blocks; i++)
+    payload_index = hdrlen + 8;
+    for (i=0; i< num_blocks; i++)
     {
         construct_ctr_preload(
                                 ctr_preload,
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723bu/hal/hal_mp.c b/drivers/net/wireless/rockchip_wlan/rtl8723bu/hal/hal_mp.c
@@ -970,6 +970,7 @@ void mpt_SetRFPath_8812A(PADAPTER pAdapter)
 void mpt_SetRFPath_8723B(PADAPTER pAdapter)
 {
 	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(pAdapter);
+	u8		p = 0, i = 0;
 	u32		ulAntennaTx, ulAntennaRx;
 	PMPT_CONTEXT	pMptCtx = &(pAdapter->mppriv.MptCtx);
 	PDM_ODM_T	pDM_Odm = &pHalData->odmpriv;
@@ -984,7 +985,6 @@ void mpt_SetRFPath_8723B(PADAPTER pAdapter)
 	}
 
 	switch (pAdapter->mppriv.antenna_tx) {
-		u8 p = 0, i = 0;
 	case ANTENNA_A: /*/ Actually path S1  (Wi-Fi)*/
 			{
 			pMptCtx->MptRfPath = ODM_RF_PATH_A;			
@@ -1068,6 +1068,7 @@ void mpt_SetRFPath_8723B(PADAPTER pAdapter)
 void mpt_SetRFPath_8703B(PADAPTER pAdapter)
 {
 	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(pAdapter);
+	u1Byte		p = 0, i = 0;
 	u4Byte					ulAntennaTx, ulAntennaRx;
 	PMPT_CONTEXT		pMptCtx = &(pAdapter->mppriv.MptCtx);
 	PDM_ODM_T		pDM_Odm = &pHalData->odmpriv;
@@ -1082,8 +1083,6 @@ void mpt_SetRFPath_8703B(PADAPTER pAdapter)
 	}
 
 	switch (pAdapter->mppriv.antenna_tx) {
-		u1Byte p = 0, i = 0;
-
 	case ANTENNA_A: /* Actually path S1  (Wi-Fi) */
 				{
 				pMptCtx->MptRfPath = ODM_RF_PATH_A;			
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723bu/hal/rtl8723b/rtl8723b_hal_init.c b/drivers/net/wireless/rockchip_wlan/rtl8723bu/hal/rtl8723b/rtl8723b_hal_init.c
@@ -2660,7 +2660,7 @@ hal_EfusePgPacketWrite1ByteHeader(
 	if (IS_HARDWARE_TYPE_8723BE(pAdapter))
 		efuse_OneByteWrite(pAdapter, 0x1FF, 00, FALSE); /* increase current */
 
-		efuse_OneByteWrite(pAdapter, efuse_addr, pg_header, bPseudoTest);
+	efuse_OneByteWrite(pAdapter, efuse_addr, pg_header, bPseudoTest);
 
 	PHY_SetMacReg(pAdapter, EFUSE_TEST, BIT26, 0);
 
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/hal_mp.c b/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/hal_mp.c
@@ -1059,6 +1059,7 @@ void mpt_SetRFPath_8812A(PADAPTER pAdapter)
 void mpt_SetRFPath_8723B(PADAPTER pAdapter)
 {
 	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(pAdapter);
+	u8		p = 0, i = 0;
 	u32		ulAntennaTx, ulAntennaRx;
 	PMPT_CONTEXT	pMptCtx = &(pAdapter->mppriv.mpt_ctx);
 	struct PHY_DM_STRUCT	*pDM_Odm = &pHalData->odmpriv;
@@ -1073,7 +1074,6 @@ void mpt_SetRFPath_8723B(PADAPTER pAdapter)
 	}
 
 	switch (pAdapter->mppriv.antenna_tx) {
-		u8 p = 0, i = 0;
 	case ANTENNA_A: { /*/ Actually path S1  (Wi-Fi)*/
 		pMptCtx->mpt_rf_path = ODM_RF_PATH_A;
 		phy_set_bb_reg(pAdapter, rS0S1_PathSwitch, BIT9 | BIT8 | BIT7, 0x0);
@@ -1149,6 +1149,7 @@ void mpt_SetRFPath_8723B(PADAPTER pAdapter)
 void mpt_SetRFPath_8703B(PADAPTER pAdapter)
 {
 	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(pAdapter);
+	u1Byte		p = 0, i = 0;
 	u4Byte					ulAntennaTx, ulAntennaRx;
 	PMPT_CONTEXT		pMptCtx = &(pAdapter->mppriv.mpt_ctx);
 	struct PHY_DM_STRUCT		*pDM_Odm = &pHalData->odmpriv;
@@ -1163,8 +1164,6 @@ void mpt_SetRFPath_8703B(PADAPTER pAdapter)
 	}
 
 	switch (pAdapter->mppriv.antenna_tx) {
-		u1Byte p = 0, i = 0;
-
 	case ANTENNA_A: { /* Actually path S1  (Wi-Fi) */
 		pMptCtx->mpt_rf_path = ODM_RF_PATH_A;
 		phy_set_bb_reg(pAdapter, rS0S1_PathSwitch, BIT9 | BIT8 | BIT7, 0x0);
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723ds/core/rtw_mi.c b/drivers/net/wireless/rockchip_wlan/rtl8723ds/core/rtw_mi.c
@@ -662,7 +662,7 @@ static void _rtw_mi_stop_drv_threads(_adapter *adapter, bool exclude_self)
 		if ((iface) && (iface->bup == _TRUE))
 			if ((exclude_self) && (iface == adapter))
 				continue;
-			rtw_stop_drv_threads(iface);
+		rtw_stop_drv_threads(iface);
 	}
 }
 void rtw_mi_stop_drv_threads(_adapter *adapter)
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/btc/halbtc8723d1ant.c b/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/btc/halbtc8723d1ant.c
@@ -6338,7 +6338,7 @@ void ex_halbtc8723d1ant_periodical(IN struct btc_coexist *btcoexist)
 		if ((coex_sta->specific_pkt_period_cnt == 0) &&
 		    (coex_sta->wifi_is_high_pri_task))
 			coex_sta->wifi_is_high_pri_task = FALSE;
-			special_pkt_finish = TRUE;
+		special_pkt_finish = TRUE;
 	}
 
 	if (!coex_sta->bt_disabled) {
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/rtl8723d/rtl8723d_hal_init.c b/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/rtl8723d/rtl8723d_hal_init.c
@@ -5032,12 +5032,12 @@ u8 SetHwReg8723D(PADAPTER padapter, u8 variable, u8 *val)
 				/* ulContent |= CAM_VALID; */
 			} else
 				ulContent = 0;
-				/* polling bit, and No Write enable, and address */
-				ulCommand = CAM_CONTENT_COUNT * ucIndex + i;
-				ulCommand = ulCommand | CAM_POLLINIG | CAM_WRITE;
-				/* write content 0 is equall to mark invalid */
-				rtw_write32(padapter, WCAMI, ulContent);  /* delay_ms(40); */
-				rtw_write32(padapter, RWCAM, ulCommand);  /* delay_ms(40); */
+			/* polling bit, and No Write enable, and address */
+			ulCommand = CAM_CONTENT_COUNT * ucIndex + i;
+			ulCommand = ulCommand | CAM_POLLINIG | CAM_WRITE;
+			/* write content 0 is equall to mark invalid */
+			rtw_write32(padapter, WCAMI, ulContent);  /* delay_ms(40); */
+			rtw_write32(padapter, RWCAM, ulCommand);  /* delay_ms(40); */
 		}
 	}
 		break;
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8822be/hal/btc/halbtc8822b2ant.c b/drivers/net/wireless/rockchip_wlan/rtl8822be/hal/btc/halbtc8822b2ant.c
@@ -1735,8 +1735,8 @@ void halbtc8822b2ant_set_ext_ant_switch(IN struct btc_coexist *btcoexist,
 
 	/* Ext switch buffer mux */
 		btcoexist->btc_write_1byte(btcoexist, 0x974, 0xff);
-		btcoexist->btc_write_1byte_bitmask(btcoexist, 0x1991, 0x3, 0x0);
-		btcoexist->btc_write_1byte_bitmask(btcoexist, 0xcbe, 0x8, 0x0);
+	btcoexist->btc_write_1byte_bitmask(btcoexist, 0x1991, 0x3, 0x0);
+	btcoexist->btc_write_1byte_bitmask(btcoexist, 0xcbe, 0x8, 0x0);
 
 
 	switch (ctrl_type) {

Original file line number	Diff line number	Diff line change
`@@ -12248,10 +12248,10 @@ void rtw_delba_check(_adapter padapter, struct sta_info psta, u8 from_timer)`
`12248`	`12248`	`ret = issue_del_ba_ex(padapter, psta->hwaddr, i, 39, 0, 3, 1);`
`12249`	`12249`	`else`
`12250`	`12250`	`issue_del_ba(padapter, psta->hwaddr, i, 39, 0);`
`12251`		`- psta->recvreorder_ctrl[i].enable = _FALSE;`
	`12251`	`+ psta->recvreorder_ctrl[i].enable = _FALSE;`
`12252`	`12252`	`if (ret != _FAIL)`
`12253`	`12253`	`psta->recvreorder_ctrl[i].ampdu_size = RX_AMPDU_SIZE_INVALID;`
`12254`		`- rtw_reset_continual_no_rx_packet(psta, i);`
	`12254`	`+ rtw_reset_continual_no_rx_packet(psta, i);`
`12255`	`12255`	`}`
`12256`	`12256`	`}`
`12257`	`12257`	`}`
Original file line number	Diff line number	Diff line change
`@@ -258,7 +258,8 @@ void rtw_IOL_cmd_buf_dump(ADAPTER Adapter,int buf_len,u8 pbuf)`
`258`	`258`	`for(i=0;i< buf_len;i++){`
`259`	`259`	`printk("%02x-",*(pbuf+i));`
`260`	`260`
`261`		`- if(j%32 ==0) printk("\n");j++;`
	`261`	`+ if(j%32 ==0) printk("\n");`
	`262`	`+ j++;`
`262`	`263`	`}`
`263`	`264`	`printk("\n");`
`264`	`265`	`printk("============= ioreg_cmd len = %d =============== \n",buf_len);`
Original file line number	Diff line number	Diff line change
`@@ -12136,10 +12136,10 @@ void rtw_delba_check(_adapter padapter, struct sta_info psta, u8 from_timer)`
`12136`	`12136`	`ret = issue_del_ba_ex(padapter, psta->hwaddr, i, 39, 0, 3, 1);`
`12137`	`12137`	`else`
`12138`	`12138`	`issue_del_ba(padapter, psta->hwaddr, i, 39, 0);`
`12139`		`- psta->recvreorder_ctrl[i].enable = _FALSE;`
	`12139`	`+ psta->recvreorder_ctrl[i].enable = _FALSE;`
`12140`	`12140`	`if (ret != _FAIL)`
`12141`	`12141`	`psta->recvreorder_ctrl[i].ampdu_size = RX_AMPDU_SIZE_INVALID;`
`12142`		`- rtw_reset_continual_no_rx_packet(psta, i);`
	`12142`	`+ rtw_reset_continual_no_rx_packet(psta, i);`
`12143`	`12143`	`}`
`12144`	`12144`	`}`
`12145`	`12145`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12153,10 +12153,10 @@ void rtw_delba_check(_adapter padapter, struct sta_info psta, u8 from_timer)`
`12153`	`12153`	`ret = issue_del_ba_ex(padapter, psta->hwaddr, i, 39, 0, 3, 1);`
`12154`	`12154`	`else`
`12155`	`12155`	`issue_del_ba(padapter, psta->hwaddr, i, 39, 0);`
`12156`		`- psta->recvreorder_ctrl[i].enable = _FALSE;`
	`12156`	`+ psta->recvreorder_ctrl[i].enable = _FALSE;`
`12157`	`12157`	`if (ret != _FAIL)`
`12158`	`12158`	`psta->recvreorder_ctrl[i].ampdu_size = RX_AMPDU_SIZE_INVALID;`
`12159`		`- rtw_reset_continual_no_rx_packet(psta, i);`
	`12159`	`+ rtw_reset_continual_no_rx_packet(psta, i);`
`12160`	`12160`	`}`
`12161`	`12161`	`}`
`12162`	`12162`	`}`