Commit a6b65a45 authored by Camylla Goncalves Cantanheide's avatar Camylla Goncalves Cantanheide Committed by Greg Kroah-Hartman
Browse files

staging: rtl8192u: Corrects 'Avoid CamelCase' for variables 



The variables of function setKey triggered a 'Avoid CamelCase'
warning from checkpatch.pl. This patch renames these
variables to correct this warning.

Signed-off-by: default avatarCamylla Goncalves Cantanheide <c.cantanheide@gmail.com>
Link: https://lore.kernel.org/r/20200317085130.21213-2-c.cantanheide@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b85791ce

drivers/staging/rtl8192u/r8192U_core.c

+26 −26
Original line number Diff line number Diff line
@@ -4877,50 +4877,50 @@ void EnableHWSecurityConfig8192(struct net_device *dev) 
	write_nic_byte(dev, SECR,  SECR_value);

}



void setKey(struct net_device *dev, u8 EntryNo, u8 KeyIndex, u16 KeyType,

	    u8 *MacAddr, u8 DefaultKey, u32 *KeyContent)

void setKey(struct net_device *dev, u8 entryno, u8 keyindex, u16 keytype,

	    u8 *macaddr, u8 defaultkey, u32 *keycontent)

{

	u32 TargetCommand = 0;

	u32 TargetContent = 0;

	u16 usConfig = 0;

	u32 target_command = 0;

	u32 target_content = 0;

	u16 us_config = 0;

	u8 i;



	if (EntryNo >= TOTAL_CAM_ENTRY)

	if (entryno >= TOTAL_CAM_ENTRY)

		RT_TRACE(COMP_ERR, "cam entry exceeds in %s\n", __func__);



	RT_TRACE(COMP_SEC,

		 "====>to %s, dev:%p, EntryNo:%d, KeyIndex:%d, KeyType:%d, MacAddr%pM\n",

		 __func__, dev, EntryNo, KeyIndex, KeyType, MacAddr);

		 __func__, dev, entryno, keyindex, keytype, macaddr);



	if (DefaultKey)

		usConfig |= BIT(15) | (KeyType << 2);

	if (defaultkey)

		us_config |= BIT(15) | (keytype << 2);

	else

		usConfig |= BIT(15) | (KeyType << 2) | KeyIndex;

		us_config |= BIT(15) | (keytype << 2) | keyindex;



	for (i = 0; i < CAM_CONTENT_COUNT; i++) {

		TargetCommand  = i + CAM_CONTENT_COUNT * EntryNo;

		TargetCommand |= BIT(31) | BIT(16);

		target_command  = i + CAM_CONTENT_COUNT * entryno;

		target_command |= BIT(31) | BIT(16);



		if (i == 0) { /* MAC|Config */

			TargetContent = (u32)(*(MacAddr + 0)) << 16 |

					(u32)(*(MacAddr + 1)) << 24 |

					(u32)usConfig;

			target_content = (u32)(*(macaddr + 0)) << 16 |

					(u32)(*(macaddr + 1)) << 24 |

					(u32)us_config;



			write_nic_dword(dev, WCAMI, TargetContent);

			write_nic_dword(dev, RWCAM, TargetCommand);

			write_nic_dword(dev, WCAMI, target_content);

			write_nic_dword(dev, RWCAM, target_command);

		} else if (i == 1) { /* MAC */

			TargetContent = (u32)(*(MacAddr + 2))	 |

					(u32)(*(MacAddr + 3)) <<  8 |

					(u32)(*(MacAddr + 4)) << 16 |

					(u32)(*(MacAddr + 5)) << 24;

			write_nic_dword(dev, WCAMI, TargetContent);

			write_nic_dword(dev, RWCAM, TargetCommand);

			target_content = (u32)(*(macaddr + 2))	 |

					(u32)(*(macaddr + 3)) <<  8 |

					(u32)(*(macaddr + 4)) << 16 |

					(u32)(*(macaddr + 5)) << 24;

			write_nic_dword(dev, WCAMI, target_content);

			write_nic_dword(dev, RWCAM, target_command);

		} else {

			/* Key Material */

			if (KeyContent) {

			if (keycontent) {

				write_nic_dword(dev, WCAMI,

						*(KeyContent + i - 2));

				write_nic_dword(dev, RWCAM, TargetCommand);

						*(keycontent + i - 2));

				write_nic_dword(dev, RWCAM, target_command);

			}

		}

	}