mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2025-01-11 07:30:16 +00:00
staging: vt6655: fix camelcase in byLocalID
Replace camel case variable name for variable byLocalID with snake case equivalent. Signed-off-by: Tommaso Merciai <tomm.merciai@gmail.com> Link: https://lore.kernel.org/r/20211010220014.148785-1-tomm.merciai@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
98f668b30e
commit
e9c1caea96
@ -1994,7 +1994,7 @@ bool bb_vt3253_init(struct vnt_private *priv)
|
||||
int ii;
|
||||
void __iomem *iobase = priv->port_offset;
|
||||
unsigned char by_rf_type = priv->byRFType;
|
||||
unsigned char by_local_id = priv->byLocalID;
|
||||
unsigned char by_local_id = priv->local_id;
|
||||
|
||||
if (by_rf_type == RF_RFMD2959) {
|
||||
if (by_local_id <= REV_ID_VT3253_A1) {
|
||||
|
@ -427,7 +427,7 @@ void CARDbRadioPowerOff(struct vnt_private *priv)
|
||||
|
||||
MACvRegBitsOff(priv->port_offset, MAC_REG_HOSTCR, HOSTCR_RXON);
|
||||
|
||||
bb_set_deep_sleep(priv, priv->byLocalID);
|
||||
bb_set_deep_sleep(priv, priv->local_id);
|
||||
|
||||
priv->bRadioOff = true;
|
||||
pr_debug("chester power off\n");
|
||||
|
@ -193,7 +193,7 @@ bool set_channel(struct vnt_private *priv, struct ieee80211_channel *ch)
|
||||
|
||||
bb_software_reset(priv);
|
||||
|
||||
if (priv->byLocalID > REV_ID_VT3253_B1) {
|
||||
if (priv->local_id > REV_ID_VT3253_B1) {
|
||||
unsigned long flags;
|
||||
|
||||
spin_lock_irqsave(&priv->lock, flags);
|
||||
|
@ -154,7 +154,7 @@ struct vnt_private {
|
||||
u32 rx_bytes;
|
||||
|
||||
/* Version control */
|
||||
unsigned char byLocalID;
|
||||
unsigned char local_id;
|
||||
unsigned char byRFType;
|
||||
|
||||
unsigned char byMaxPwrLevel;
|
||||
|
@ -219,7 +219,7 @@ static void device_init_registers(struct vnt_private *priv)
|
||||
MACvInitialize(priv);
|
||||
|
||||
/* Get Local ID */
|
||||
VNSvInPortB(priv->port_offset + MAC_REG_LOCALID, &priv->byLocalID);
|
||||
VNSvInPortB(priv->port_offset + MAC_REG_LOCALID, &priv->local_id);
|
||||
|
||||
spin_lock_irqsave(&priv->lock, flags);
|
||||
|
||||
@ -331,7 +331,7 @@ static void device_init_registers(struct vnt_private *priv)
|
||||
(unsigned char)(ii + EEP_OFS_OFDMA_PWR_dBm));
|
||||
}
|
||||
|
||||
if (priv->byLocalID > REV_ID_VT3253_B1) {
|
||||
if (priv->local_id > REV_ID_VT3253_B1) {
|
||||
MACvSelectPage1(priv->port_offset);
|
||||
|
||||
VNSvOutPortB(priv->port_offset + MAC_REG_MSRCTL + 1,
|
||||
@ -398,7 +398,7 @@ static void device_init_registers(struct vnt_private *priv)
|
||||
/* reset Rx pointer */
|
||||
CARDvSafeResetTx(priv);
|
||||
|
||||
if (priv->byLocalID <= REV_ID_VT3253_A1)
|
||||
if (priv->local_id <= REV_ID_VT3253_A1)
|
||||
MACvRegBitsOn(priv->port_offset, MAC_REG_RCR, RCR_WPAERR);
|
||||
|
||||
/* Turn On Rx DMA */
|
||||
|
@ -100,7 +100,7 @@ static bool vnt_rx_data(struct vnt_private *priv, struct sk_buff *skb,
|
||||
rx_status.rate_idx = rate_idx;
|
||||
|
||||
if (ieee80211_has_protected(fc)) {
|
||||
if (priv->byLocalID > REV_ID_VT3253_A1)
|
||||
if (priv->local_id > REV_ID_VT3253_A1)
|
||||
rx_status.flag |= RX_FLAG_DECRYPTED;
|
||||
|
||||
/* Drop packet */
|
||||
|
@ -81,7 +81,7 @@ static int vnt_set_keymode(struct ieee80211_hw *hw, u8 *mac_addr,
|
||||
}
|
||||
|
||||
MACvSetKeyEntry(priv, key_mode, entry, key_inx,
|
||||
bssid, (u32 *)key->key, priv->byLocalID);
|
||||
bssid, (u32 *)key->key, priv->local_id);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
@ -763,14 +763,14 @@ bool MACbPSWakeup(struct vnt_private *priv)
|
||||
void MACvSetKeyEntry(struct vnt_private *priv, unsigned short wKeyCtl,
|
||||
unsigned int uEntryIdx, unsigned int uKeyIdx,
|
||||
unsigned char *pbyAddr, u32 *pdwKey,
|
||||
unsigned char byLocalID)
|
||||
unsigned char local_id)
|
||||
{
|
||||
void __iomem *io_base = priv->port_offset;
|
||||
unsigned short offset;
|
||||
u32 data;
|
||||
int ii;
|
||||
|
||||
if (byLocalID <= 1)
|
||||
if (local_id <= 1)
|
||||
return;
|
||||
|
||||
offset = MISCFIFO_KEYETRY0;
|
||||
|
@ -921,7 +921,7 @@ bool MACbPSWakeup(struct vnt_private *priv);
|
||||
void MACvSetKeyEntry(struct vnt_private *priv, unsigned short wKeyCtl,
|
||||
unsigned int uEntryIdx, unsigned int uKeyIdx,
|
||||
unsigned char *pbyAddr, u32 *pdwKey,
|
||||
unsigned char byLocalID);
|
||||
unsigned char local_id);
|
||||
void MACvDisableKeyEntry(struct vnt_private *priv, unsigned int uEntryIdx);
|
||||
|
||||
#endif /* __MAC_H__ */
|
||||
|
@ -1012,7 +1012,7 @@ s_cbFillTxBufHead(struct vnt_private *pDevice, unsigned char byPktType,
|
||||
|
||||
cbFrameSize += info->control.hw_key->icv_len;
|
||||
|
||||
if (pDevice->byLocalID > REV_ID_VT3253_A1) {
|
||||
if (pDevice->local_id > REV_ID_VT3253_A1) {
|
||||
/* MAC Header should be padding 0 to DW alignment. */
|
||||
uPadding = 4 - (ieee80211_get_hdrlen_from_skb(skb) % 4);
|
||||
uPadding %= 4;
|
||||
|
Loading…
x
Reference in New Issue
Block a user