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

staging: vt6656: rename CARDvSetRSPINF to vnt_set_rspinf 



Drop card and rename to vnt_set_rspinf

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

drivers/staging/vt6656/card.c

+3 −3
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
 * Purpose: Provide functions to setup NIC operation mode

 * Functions:

 *      s_vSafeResetTx - Rest Tx

 *      CARDvSetRSPINF - Set RSPINF

 *      vnt_set_rspinf - Set RSPINF

 *      vnt_update_ifs - Update slotTime,SIFS,DIFS, and EIFS

 *      vnt_update_top_rates - Update BasicTopRate

 *      CARDbAddBasicRate - Add to BasicRateSet
@@ -291,7 +291,7 @@ static void vnt_calculate_ofdm_rate(u16 rate, u8 bb_type, 
 *

 */



void CARDvSetRSPINF(struct vnt_private *priv, u8 bb_type)

void vnt_set_rspinf(struct vnt_private *priv, u8 bb_type)

{

	struct vnt_phy_field phy[4];

	u8 tx_rate[9] = {0, 0, 0, 0, 0, 0, 0, 0, 0}; /* For OFDM */
@@ -846,7 +846,7 @@ void CARDvSetBSSMode(struct vnt_private *priv) 
		vnt_control_out_u8(priv, MESSAGE_REQUEST_BBREG, 0x88, 0x08);



	vnt_update_ifs(priv);

	CARDvSetRSPINF(priv, (u8)priv->byBBType);

	vnt_set_rspinf(priv, (u8)priv->byBBType);



	if (priv->byBBType == BB_TYPE_11A) {

		if (priv->byRFType == RF_AIROHA7230) {

drivers/staging/vt6656/card.h

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ typedef enum _CARD_PHY_TYPE { 
struct vnt_private;



void vnt_set_channel(struct vnt_private *, u32);

void CARDvSetRSPINF(struct vnt_private *, u8);

void vnt_set_rspinf(struct vnt_private *, u8);

void vnt_update_ifs(struct vnt_private *);

void vnt_update_top_rates(struct vnt_private *);

void CARDbAddBasicRate(struct vnt_private *, u16);

drivers/staging/vt6656/datarate.c

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

		*pwMaxBasicRate = pDevice->byTopOFDMBasicRate;

	if (wOldBasicRate != pDevice->wBasicRate)

		CARDvSetRSPINF((void *)pDevice, pDevice->byBBType);

		vnt_set_rspinf(pDevice, pDevice->byBBType);



	DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Exit ParseMaxRate\n");

}

drivers/staging/vt6656/wmgr.c

+4 −4
Original line number Diff line number Diff line
@@ -1705,7 +1705,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==true) 
                    pDevice->byPreambleType = 0;

                }

                if (pDevice->byPreambleType != byOldPreambleType)

                    CARDvSetRSPINF(pDevice, (u8)pDevice->byBBType);

			vnt_set_rspinf(pDevice, (u8)pDevice->byBBType);

            //

            // Basic Rate Set may change dynamically

            //
@@ -1930,7 +1930,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==true) 
                        pDevice->byPreambleType = 0;

                    }

                    if (pDevice->byPreambleType != byOldPreambleType)

                        CARDvSetRSPINF(pDevice, (u8)pDevice->byBBType);

			vnt_set_rspinf(pDevice, (u8)pDevice->byBBType);



                     // MACvRegBitsOff(pDevice->PortOffset, MAC_REG_RCR, RCR_BSSID);

                     // set highest basic rate
@@ -2379,7 +2379,7 @@ void vMgrJoinBSSBegin(struct vnt_private *pDevice, PCMD_STATUS pStatus) 
                pDevice->byPreambleType = 0;

            }

            // Change PreambleType must set RSPINF again

            CARDvSetRSPINF(pDevice, (u8)pDevice->byBBType);

	    vnt_set_rspinf(pDevice, (u8)pDevice->byBBType);



            DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Join ESS\n");
@@ -2510,7 +2510,7 @@ void vMgrJoinBSSBegin(struct vnt_private *pDevice, PCMD_STATUS pStatus) 
                pDevice->byPreambleType = 0;

            }

            // Change PreambleType must set RSPINF again

            CARDvSetRSPINF(pDevice, (u8)pDevice->byBBType);

	    vnt_set_rspinf(pDevice, (u8)pDevice->byBBType);



            // Prepare beacon

		bMgrPrepareBeaconToSend((void *) pDevice, pMgmt);