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

staging: vt6656: rename CARDbIsOFDMinBasicRate to vnt_ofdm_min_rate 



drop card and basic rename to vnt_ofdm_min_rate

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

drivers/staging/vt6656/card.c

+4 −4
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
 *      vnt_update_top_rates - Update BasicTopRate

 *      vnt_add_basic_rate - Add to BasicRateSet

 *      CARDbSetBasicRate - Set Basic Tx Rate

 *      CARDbIsOFDMinBasicRate - Check if any OFDM rate is in BasicRateSet

 *      vnt_ofdm_min_rate - Check if any OFDM rate is in BasicRateSet

 *      CARDvSetLoopbackMode - Set Loopback mode

 *      CARDbSoftwareReset - Sortware reset NIC

 *      CARDqGetTSFOffset - Calculate TSFOffset
@@ -161,7 +161,7 @@ static u16 vnt_get_ofdm_rate(struct vnt_private *priv, u16 rate_idx) 
	dev_dbg(&priv->usb->dev, "%s basic rate: %d\n",

					__func__,  priv->wBasicRate);



	if (!CARDbIsOFDMinBasicRate(priv)) {

	if (!vnt_ofdm_min_rate(priv)) {

		dev_dbg(&priv->usb->dev, "%s (NO OFDM) %d\n",

						__func__, rate_idx);

		if (rate_idx > RATE_24M)
@@ -514,7 +514,7 @@ void vnt_add_basic_rate(struct vnt_private *priv, u16 rate_idx) 
	vnt_update_top_rates(priv);

}



int CARDbIsOFDMinBasicRate(struct vnt_private *priv)

int vnt_ofdm_min_rate(struct vnt_private *priv)

{

	int ii;
@@ -531,7 +531,7 @@ u8 CARDbyGetPktType(struct vnt_private *priv) 


	if (priv->byBBType == BB_TYPE_11A || priv->byBBType == BB_TYPE_11B)

		return (u8)priv->byBBType;

	else if (CARDbIsOFDMinBasicRate(priv))

	else if (vnt_ofdm_min_rate(priv))

		return PK_TYPE_11GA;

	else

		return PK_TYPE_11GB;

drivers/staging/vt6656/card.h

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ void vnt_set_rspinf(struct vnt_private *, u8); 
void vnt_update_ifs(struct vnt_private *);

void vnt_update_top_rates(struct vnt_private *);

void vnt_add_basic_rate(struct vnt_private *, u16);

int CARDbIsOFDMinBasicRate(struct vnt_private *pDevice);

int vnt_ofdm_min_rate(struct vnt_private *);

void CARDvAdjustTSF(struct vnt_private *pDevice, u8 byRxRate,

		u64 qwBSSTimestamp, u64 qwLocalTSF);

bool CARDbGetCurrentTSF(struct vnt_private *pDevice, u64 *pqwCurrTSF);

drivers/staging/vt6656/datarate.c

+1 −1
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ void RATEvParseMaxRate(struct vnt_private *pDevice, 
	}



	if ((pDevice->byPacketType == PK_TYPE_11GB)

			&& CARDbIsOFDMinBasicRate((void *)pDevice)) {

			&& vnt_ofdm_min_rate(pDevice)) {

		pDevice->byPacketType = PK_TYPE_11GA;

	}