devang преди 8 години
родител
ревизия
29774b72fb
променени са 4 файла, в които са добавени 10 реда и са изтрити 11 реда
  1. 1 1
      core/rtw_mlme_ext.c
  2. 4 4
      core/rtw_security.c
  3. 1 1
      hal/OUTSRC/rtl8812a/HalPhyRf_8812A.c
  4. 4 5
      os_dep/linux/ioctl_linux.c

+ 1 - 1
core/rtw_mlme_ext.c

@@ -5617,7 +5617,7 @@ unsigned int on_action_public_p2p(union recv_frame *precv_frame)
 
 				//	Commented by Kurt 20120113
 				//	Get peer_dev_addr here if peer doesn't issue prov_disc frame.
-				if( _rtw_memcmp(pwdinfo->rx_prov_disc_info.peerDevAddr, empty_addr, ETH_ALEN) );
+				if( _rtw_memcmp(pwdinfo->rx_prov_disc_info.peerDevAddr, empty_addr, ETH_ALEN) )
 					_rtw_memcpy(pwdinfo->rx_prov_disc_info.peerDevAddr, GetAddr2Ptr(pframe), ETH_ALEN);
 
 				result = process_p2p_group_negotation_req( pwdinfo, frame_body, len );

+ 4 - 4
core/rtw_security.c

@@ -1458,8 +1458,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,
@@ -1837,8 +1837,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,

+ 1 - 1
hal/OUTSRC/rtl8812a/HalPhyRf_8812A.c

@@ -1404,7 +1404,7 @@ void _IQK_Tx_8812A(
 			if (TX1IQKOK == FALSE)
 			    	break;				// TXK fail, Don't do RXK
 			
-				if (VDF_enable == 1){
+			if (VDF_enable == 1){
 				ODM_SetBBReg(pDM_Odm, 0xee8, BIT(31), 0x0);    // TX VDF Disable
 				ODM_RT_TRACE(pDM_Odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("RXVDF Start\n"));
 				

+ 4 - 5
os_dep/linux/ioctl_linux.c

@@ -10028,13 +10028,12 @@ static int rtw_mp_read_reg(struct net_device *dev,
 				{
 					  if( i%2==0 )
 					  {
-						   tmp[j]=' ';
-						   j++;
+						tmp[j]=' ';
+						j++;
 					  }
 					  if ( data[i] != '\0' )
-					 	 tmp[j] = data[i];
-					 	
-					  	 j++;
+						tmp[j] = data[i];
+					  j++;
 				}
 				pch = tmp;		
 				DBG_871X("pch=%s",pch);