diff options
| author | Malcolm Priestley <tvboxspy@gmail.com> | 2014-07-19 12:30:17 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-21 12:11:58 -0700 |
| commit | 995c91e0c25437329d3ed34148eb709cac1ac5b9 (patch) | |
| tree | b5fb9f21600ba94408317730cad8e30e2c896d06 /drivers/staging/vt6656 | |
| parent | 2044dbdb0b337ab7ddc36c45fc792b76913b57e8 (diff) | |
| download | op-kernel-dev-995c91e0c25437329d3ed34148eb709cac1ac5b9.zip op-kernel-dev-995c91e0c25437329d3ed34148eb709cac1ac5b9.tar.gz | |
staging: vt6656: struct vnt_private remove uCwMin/uCwMax
Although set these variables are not used.
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vt6656')
| -rw-r--r-- | drivers/staging/vt6656/card.c | 10 | ||||
| -rw-r--r-- | drivers/staging/vt6656/device.h | 2 |
2 files changed, 2 insertions, 10 deletions
diff --git a/drivers/staging/vt6656/card.c b/drivers/staging/vt6656/card.c index 8820871..f3fd7d6 100644 --- a/drivers/staging/vt6656/card.c +++ b/drivers/staging/vt6656/card.c @@ -369,13 +369,11 @@ void vnt_update_ifs(struct vnt_private *priv) priv->uSlot = C_SLOT_SHORT; priv->uSIFS = C_SIFS_A; priv->uDIFS = C_SIFS_A + 2 * C_SLOT_SHORT; - priv->uCwMin = C_CWMIN_A; max_min = 4; } else if (priv->byPacketType == PK_TYPE_11B) { priv->uSlot = C_SLOT_LONG; priv->uSIFS = C_SIFS_BG; priv->uDIFS = C_SIFS_BG + 2 * C_SLOT_LONG; - priv->uCwMin = C_CWMIN_B; max_min = 5; } else {/* PK_TYPE_11GA & PK_TYPE_11GB */ bool ofdm_rate = false; @@ -397,16 +395,12 @@ void vnt_update_ifs(struct vnt_private *priv) } } - if (ofdm_rate == true) { - priv->uCwMin = C_CWMIN_A; + if (ofdm_rate == true) max_min = 4; - } else { - priv->uCwMin = C_CWMIN_B; + else max_min = 5; - } } - priv->uCwMax = C_CWMAX; priv->uEIFS = C_EIFS; switch (priv->rf_type) { diff --git a/drivers/staging/vt6656/device.h b/drivers/staging/vt6656/device.h index c4e83b5..f67173b 100644 --- a/drivers/staging/vt6656/device.h +++ b/drivers/staging/vt6656/device.h @@ -328,8 +328,6 @@ struct vnt_private { u32 uDIFS; /* Current DIFS */ u32 uEIFS; /* Current EIFS */ u32 uSlot; /* Current SlotTime */ - u32 uCwMin; /* Current CwMin */ - u32 uCwMax; /* CwMax is fixed on 1023 */ /* Rate */ u8 byBBType; /* 0: 11A, 1:11B, 2:11G */ |
