Commit 995c91e0 authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman
Browse files

staging: vt6656: struct vnt_private remove uCwMin/uCwMax 



Although set these variables are not used.

Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2044dbdb

drivers/staging/vt6656/card.c

+2 −8
Original line number Original line Diff line number Diff line
@@ -369,13 +369,11 @@ void vnt_update_ifs(struct vnt_private *priv) 
		priv->uSlot = C_SLOT_SHORT;

		priv->uSlot = C_SLOT_SHORT;

		priv->uSIFS = C_SIFS_A;

		priv->uSIFS = C_SIFS_A;

		priv->uDIFS = C_SIFS_A + 2 * C_SLOT_SHORT;

		priv->uDIFS = C_SIFS_A + 2 * C_SLOT_SHORT;

		priv->uCwMin = C_CWMIN_A;

		max_min = 4;

		max_min = 4;

	} else if (priv->byPacketType == PK_TYPE_11B) {

	} else if (priv->byPacketType == PK_TYPE_11B) {

		priv->uSlot = C_SLOT_LONG;

		priv->uSlot = C_SLOT_LONG;

		priv->uSIFS = C_SIFS_BG;

		priv->uSIFS = C_SIFS_BG;

		priv->uDIFS = C_SIFS_BG + 2 * C_SLOT_LONG;

		priv->uDIFS = C_SIFS_BG + 2 * C_SLOT_LONG;

		priv->uCwMin = C_CWMIN_B;

		max_min = 5;

		max_min = 5;

	} else {/* PK_TYPE_11GA & PK_TYPE_11GB */

	} else {/* PK_TYPE_11GA & PK_TYPE_11GB */

		bool ofdm_rate = false;

		bool ofdm_rate = false;
@@ -397,16 +395,12 @@ void vnt_update_ifs(struct vnt_private *priv) 
			}

			}

		}

		}





		if (ofdm_rate == true) {

		if (ofdm_rate == true)

			priv->uCwMin = C_CWMIN_A;

			max_min = 4;

			max_min = 4;

		} else {

		else

			priv->uCwMin = C_CWMIN_B;

			max_min = 5;

			max_min = 5;

	}

	}

	}





	priv->uCwMax = C_CWMAX;

	priv->uEIFS = C_EIFS;

	priv->uEIFS = C_EIFS;





	switch (priv->rf_type) {

	switch (priv->rf_type) {

drivers/staging/vt6656/device.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -328,8 +328,6 @@ struct vnt_private { 
	u32 uDIFS;  /* Current DIFS */

	u32 uDIFS;  /* Current DIFS */

	u32 uEIFS;  /* Current EIFS */

	u32 uEIFS;  /* Current EIFS */

	u32 uSlot;  /* Current SlotTime */

	u32 uSlot;  /* Current SlotTime */

	u32 uCwMin; /* Current CwMin */

	u32 uCwMax; /* CwMax is fixed on 1023 */





	/* Rate */

	/* Rate */

	u8 byBBType; /* 0: 11A, 1:11B, 2:11G */

	u8 byBBType; /* 0: 11A, 1:11B, 2:11G */