Signed-off-by: Tommaso Merciai <tomm.merciai@xxxxxxxxx> --- Changes since v2: - Add changelog. Changes since v1: - Make the commit message more clearer. --- drivers/staging/vt6655/baseband.c | 4 ++-- drivers/staging/vt6655/card.c | 2 +- drivers/staging/vt6655/device.h | 2 +- drivers/staging/vt6655/device_main.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/staging/vt6655/baseband.c b/drivers/staging/vt6655/baseband.c index f73f3fad3e05..170c4056946f 100644 --- a/drivers/staging/vt6655/baseband.c +++ b/drivers/staging/vt6655/baseband.c @@ -2200,7 +2200,7 @@ bb_set_short_slot_time(struct vnt_private *priv) bb_read_embedded(priv, 0x0A, &by_bb_rx_conf); /* CR10 */ - if (priv->bShortSlotTime) + if (priv->b_short_slot_time) by_bb_rx_conf &= 0xDF; /* 1101 1111 */ else by_bb_rx_conf |= 0x20; /* 0010 0000 */ @@ -2223,7 +2223,7 @@ void bb_set_vga_gain_offset(struct vnt_private *priv, unsigned char by_data) /* patch for 3253B0 Baseband with Cardbus module */ if (by_data == priv->abyBBVGA[0]) by_bb_rx_conf |= 0x20; /* 0010 0000 */ - else if (priv->bShortSlotTime) + else if (priv->b_short_slot_time) by_bb_rx_conf &= 0xDF; /* 1101 1111 */ else by_bb_rx_conf |= 0x20; /* 0010 0000 */ diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c index 3ef3a6e0e6e1..7a08ea0c7692 100644 --- a/drivers/staging/vt6655/card.c +++ b/drivers/staging/vt6655/card.c @@ -258,7 +258,7 @@ bool CARDbSetPhyParameter(struct vnt_private *priv, u8 bb_type) bb_write_embedded(priv, 0x88, 0x08); bySIFS = C_SIFS_BG; - if (priv->bShortSlotTime) { + if (priv->b_short_slot_time) { bySlot = C_SLOT_SHORT; byDIFS = C_SIFS_BG + 2 * C_SLOT_SHORT; } else { diff --git a/drivers/staging/vt6655/device.h b/drivers/staging/vt6655/device.h index 2af769174e33..63aa62e483c8 100644 --- a/drivers/staging/vt6655/device.h +++ b/drivers/staging/vt6655/device.h @@ -215,7 +215,7 @@ struct vnt_private { bool bEncryptionEnable; bool bLongHeader; - bool bShortSlotTime; + bool b_short_slot_time; bool bProtectMode; bool bNonERPPresent; bool bBarkerPreambleMd; diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index d40c2ac14928..8ae0fbfd134f 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -1440,9 +1440,9 @@ static void vnt_bss_info_changed(struct ieee80211_hw *hw, if (changed & BSS_CHANGED_ERP_SLOT) { if (conf->use_short_slot) - priv->bShortSlotTime = true; + priv->b_short_slot_time = true; else - priv->bShortSlotTime = false; + priv->b_short_slot_time = false; CARDbSetPhyParameter(priv, priv->byBBType); bb_set_vga_gain_offset(priv, priv->abyBBVGA[0]); -- 2.25.1