Autres/rtl8812AU_8821AU_linux_debian9-10
1
0
Fork 0
mirror of https://github.com/abperiasamy/rtl8812AU_8821AU_linux.git synced 2025-08-16 08:34:15 +02:00
Code Issues Releases Wiki Activity

Fix -Wmisleading-indentation. (#149)

Browse Source 
Most of these are just tab/space normalizations, but two appear to be
real bugs.
This commit is contained in:
Peter H. Li 2016-09-13 15:47:44 -07:00 committed by Harshavardhana
parent e4566b49ae
commit 3771dc2fea
4 changed files with 53 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/rtw_mlme_ext.c
View File

@ -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 );

16
core/rtw_security.c
View File

@ -1431,7 +1431,7 @@ _func_enter_;
bitwise_xor(aes_out, mic_header2, chain_buffer);
aes128k128d(key, chain_buffer, aes_out);
for (i = 0; i < num_blocks; i++)
for (i = 0; i < num_blocks; i++)
{
bitwise_xor(aes_out, &pframe[payload_index], chain_buffer);//bitwise_xor(aes_out, &message[payload_index], chain_buffer);
@ -1456,10 +1456,10 @@ _func_enter_;
/* Insert MIC into payload */
for (j = 0; j < 8; j++)
pframe[payload_index+j] = mic[j]; //message[payload_index+j] = mic[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,
@ -1810,7 +1810,7 @@ _func_enter_;
bitwise_xor(aes_out, mic_header2, chain_buffer);
aes128k128d(key, chain_buffer, aes_out);
for (i = 0; i < num_blocks; i++)
for (i = 0; i < num_blocks; i++)
{
bitwise_xor(aes_out, &message[payload_index], chain_buffer);
@ -1835,10 +1835,10 @@ _func_enter_;
/* Insert MIC into payload */
for (j = 0; j < 8; j++)
message[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,

40
hal/OUTSRC/rtl8812a/HalPhyRf_8812A.c
View File

@ -1402,33 +1402,33 @@ void _IQK_Tx_8812A(
ODM_SetBBReg(pDM_Odm, 0x82c, BIT(31), 0x1); // [31] = 1 --> Page C1
if (TX1IQKOK == FALSE)
break; // TXK fail, Don't do RXK
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"));
//====== RX IQK ======
ODM_SetBBReg(pDM_Odm, 0x82c, BIT(31), 0x0); // [31] = 0 --> Page C
ODM_SetRFReg(pDM_Odm, Path, 0xef, bRFRegOffsetMask, 0x80000);
ODM_SetRFReg(pDM_Odm, Path, 0x30, bRFRegOffsetMask, 0x30000);
ODM_SetRFReg(pDM_Odm, Path, 0x31, bRFRegOffsetMask, 0x3f7ff);
ODM_SetRFReg(pDM_Odm, Path, 0x32, bRFRegOffsetMask, 0xfe7bf);
ODM_SetRFReg(pDM_Odm, Path, 0x8f, bRFRegOffsetMask, 0x88001);
ODM_SetRFReg(pDM_Odm, Path, 0x65, bRFRegOffsetMask, 0x931d0);
ODM_SetRFReg(pDM_Odm, Path, 0xef, bRFRegOffsetMask, 0x00000);
ODM_SetBBReg(pDM_Odm, 0x978, BIT(31), 0x1);
ODM_SetBBReg(pDM_Odm, 0x97c, BIT(31), 0x0);
ODM_Write4Byte(pDM_Odm, 0x984, 0x0046a911);
ODM_SetBBReg(pDM_Odm, 0x82c, BIT(31), 0x1); // [31] = 1 --> Page C1
ODM_Write4Byte(pDM_Odm, 0xe88, 0x02140119);
ODM_Write4Byte(pDM_Odm, 0xe8c, 0x28161420);
//====== RX IQK ======
ODM_SetBBReg(pDM_Odm, 0x82c, BIT(31), 0x0); // [31] = 0 --> Page C
ODM_SetRFReg(pDM_Odm, Path, 0xef, bRFRegOffsetMask, 0x80000);
ODM_SetRFReg(pDM_Odm, Path, 0x30, bRFRegOffsetMask, 0x30000);
ODM_SetRFReg(pDM_Odm, Path, 0x31, bRFRegOffsetMask, 0x3f7ff);
ODM_SetRFReg(pDM_Odm, Path, 0x32, bRFRegOffsetMask, 0xfe7bf);
ODM_SetRFReg(pDM_Odm, Path, 0x8f, bRFRegOffsetMask, 0x88001);
ODM_SetRFReg(pDM_Odm, Path, 0x65, bRFRegOffsetMask, 0x931d0);
ODM_SetRFReg(pDM_Odm, Path, 0xef, bRFRegOffsetMask, 0x00000);
ODM_SetBBReg(pDM_Odm, 0x978, BIT(31), 0x1);
ODM_SetBBReg(pDM_Odm, 0x97c, BIT(31), 0x0);
ODM_Write4Byte(pDM_Odm, 0x984, 0x0046a911);
ODM_SetBBReg(pDM_Odm, 0x82c, BIT(31), 0x1); // [31] = 1 --> Page C1
ODM_Write4Byte(pDM_Odm, 0xe88, 0x02140119);
ODM_Write4Byte(pDM_Odm, 0xe8c, 0x28161420);
for (k = 0;k <= 2; k++){
ODM_SetBBReg(pDM_Odm, 0x82c, BIT(31), 0x0); // [31] = 0 --> Page C
ODM_SetBBReg(pDM_Odm, 0x978, 0x03FF8000, (VDF_X[k])>>21&0x000007ff);
ODM_SetBBReg(pDM_Odm, 0x978, 0x000007FF, (VDF_Y[k])>>21&0x000007ff);
ODM_SetBBReg(pDM_Odm, 0x978, 0x000007FF, (VDF_Y[k])>>21&0x000007ff);
ODM_SetBBReg(pDM_Odm, 0x82c, BIT(31), 0x1); // [31] = 1 --> Page C1
switch (k){
case 0:

52
os_dep/linux/ioctl_linux.c
View File

@ -10025,37 +10025,33 @@ static int rtw_mp_read_reg(struct net_device *dev,
//*(u16*)data = rtw_read16(padapter, addr);
sprintf(data, "%04x\n", rtw_read16(padapter, addr));
for( i=0 ; i <= strlen(data) ; i++)
{
if( i%2==0 )
{
tmp[j]=' ';
j++;
}
if ( data[i] != '\0' )
tmp[j] = data[i];
j++;
}
pch = tmp;
DBG_871X("pch=%s",pch);
{
if( i%2==0 )
tmp[j++]=' ';
if ( data[i] != '\0' )
tmp[j++] = data[i];
}
pch = tmp;
DBG_871X("pch=%s",pch);
while( *pch != '\0' )
{
pnext = strpbrk(pch, " ");
if (!pnext)
break;
while( *pch != '\0' )
pnext++;
if ( *pnext != '\0' )
{
pnext = strpbrk(pch, " ");
if (!pnext)
break;
pnext++;
if ( *pnext != '\0' )
{
strtout = simple_strtoul (pnext , &ptmp, 16);
sprintf( extra, "%s %d" ,extra ,strtout );
}
else{
break;
}
pch = pnext;
strtout = simple_strtoul (pnext , &ptmp, 16);
sprintf( extra, "%s %d" ,extra ,strtout );
}
else
{
break;
}
pch = pnext;
}
wrqu->length = 6;
break;
case 'd':