staging: vt6656: struct vnt_private remove uCwMin/uCwMax
authorMalcolm Priestley <tvboxspy@gmail.com>
Sat, 19 Jul 2014 11:30:17 +0000 (12:30 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 21 Jul 2014 19:11:58 +0000 (12:11 -0700)
Although set these variables are not used.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/vt6656/card.c
drivers/staging/vt6656/device.h

index 8820871..f3fd7d6 100644 (file)
@@ -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) {
index c4e83b5..f67173b 100644 (file)
@@ -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 */