mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-03 17:40:04 +00:00
staging: vt6656: struct vnt_private replace byPacketType with packet_type
Removing type prefix and camel case. Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
65df77e2ca
commit
e12471db91
4 changed files with 7 additions and 7 deletions
|
@ -365,12 +365,12 @@ void vnt_update_ifs(struct vnt_private *priv)
|
|||
u8 max_min = 0;
|
||||
u8 data[4];
|
||||
|
||||
if (priv->byPacketType == PK_TYPE_11A) {
|
||||
if (priv->packet_type == PK_TYPE_11A) {
|
||||
priv->slot = C_SLOT_SHORT;
|
||||
priv->sifs = C_SIFS_A;
|
||||
priv->difs = C_SIFS_A + 2 * C_SLOT_SHORT;
|
||||
max_min = 4;
|
||||
} else if (priv->byPacketType == PK_TYPE_11B) {
|
||||
} else if (priv->packet_type == PK_TYPE_11B) {
|
||||
priv->slot = C_SLOT_LONG;
|
||||
priv->sifs = C_SIFS_BG;
|
||||
priv->difs = C_SIFS_BG + 2 * C_SLOT_LONG;
|
||||
|
@ -793,7 +793,7 @@ void vnt_set_bss_mode(struct vnt_private *priv)
|
|||
else
|
||||
vnt_mac_set_bb_type(priv, priv->bb_type);
|
||||
|
||||
priv->byPacketType = vnt_get_pkt_type(priv);
|
||||
priv->packet_type = vnt_get_pkt_type(priv);
|
||||
|
||||
if (priv->bb_type == BB_TYPE_11A)
|
||||
vnt_control_out_u8(priv, MESSAGE_REQUEST_BBREG, 0x88, 0x03);
|
||||
|
|
|
@ -331,7 +331,7 @@ struct vnt_private {
|
|||
|
||||
/* Rate */
|
||||
u8 bb_type; /* 0: 11A, 1:11B, 2:11G */
|
||||
u8 byPacketType; /* 0:11a 1:11b 2:11gb 3:11ga */
|
||||
u8 packet_type; /* 0:11a 1:11b 2:11gb 3:11ga */
|
||||
u32 wBasicRate;
|
||||
u8 byTopOFDMBasicRate;
|
||||
u8 byTopCCKBasicRate;
|
||||
|
|
|
@ -122,7 +122,7 @@ static void device_set_options(struct vnt_private *priv)
|
|||
priv->byLongRetryLimit = LONG_RETRY_DEF;
|
||||
priv->op_mode = NL80211_IFTYPE_UNSPECIFIED;
|
||||
priv->bb_type = BBP_TYPE_DEF;
|
||||
priv->byPacketType = priv->bb_type;
|
||||
priv->packet_type = priv->bb_type;
|
||||
priv->byAutoFBCtrl = AUTO_FB_0;
|
||||
priv->byPreambleType = 0;
|
||||
priv->exist_sw_net_addr = false;
|
||||
|
@ -142,7 +142,7 @@ static int device_init_registers(struct vnt_private *priv)
|
|||
u8 calib_tx_iq = 0, calib_tx_dc = 0, calib_rx_iq = 0;
|
||||
|
||||
dev_dbg(&priv->usb->dev, "---->INIbInitAdapter. [%d][%d]\n",
|
||||
DEVICE_INIT_COLD, priv->byPacketType);
|
||||
DEVICE_INIT_COLD, priv->packet_type);
|
||||
|
||||
if (!vnt_check_firmware_version(priv)) {
|
||||
if (vnt_download_firmware(priv) == true) {
|
||||
|
|
|
@ -771,7 +771,7 @@ int vnt_tx_packet(struct vnt_private *priv, struct sk_buff *skb)
|
|||
}
|
||||
|
||||
if (current_rate > RATE_11M)
|
||||
pkt_type = priv->byPacketType;
|
||||
pkt_type = priv->packet_type;
|
||||
else
|
||||
pkt_type = PK_TYPE_11B;
|
||||
|
||||
|
|
Loading…
Reference in a new issue