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

staging: vt6656: rename vUpdateIFS to vnt_update_ifs 



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

drivers/staging/vt6656/bssdb.c

+2 −2
Original line number Diff line number Diff line
@@ -959,12 +959,12 @@ void BSSvSecondCallBack(struct work_struct *work) 
			if (pDevice->bShortSlotTime) {

				pDevice->bShortSlotTime = false;

				BBvSetShortSlotTime(pDevice);

				vUpdateIFS((void *) pDevice);

				vnt_update_ifs(pDevice);

			}

		} else if (!pDevice->bShortSlotTime) {

				pDevice->bShortSlotTime = true;

				BBvSetShortSlotTime(pDevice);

				vUpdateIFS((void *) pDevice);

				vnt_update_ifs(pDevice);

		}



		/* on/off barker long preamble mode */

drivers/staging/vt6656/card.c

+4 −4
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
 * Functions:

 *      s_vSafeResetTx - Rest Tx

 *      CARDvSetRSPINF - Set RSPINF

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

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

 *      CARDvUpdateBasicTopRate - Update BasicTopRate

 *      CARDbAddBasicRate - Add to BasicRateSet

 *      CARDbSetBasicRate - Set Basic Tx Rate
@@ -41,7 +41,7 @@ 
 * Revision History:

 *      06-10-2003 Bryan YC Fan:  Re-write codes to support VT3253 spec.

 *      08-26-2003 Kyle Hsu:      Modify the definition type of dwIoBase.

 *      09-01-2003 Bryan YC Fan:  Add vUpdateIFS().

 *      09-01-2003 Bryan YC Fan:  Add vnt_update_ifs().

 *

 */
@@ -384,7 +384,7 @@ void CARDvSetRSPINF(struct vnt_private *priv, u8 bb_type) 
 * Return Value: None.

 *

 */

void vUpdateIFS(struct vnt_private *priv)

void vnt_update_ifs(struct vnt_private *priv)

{

	u8 max_min = 0;

	u8 data[4];
@@ -845,7 +845,7 @@ void CARDvSetBSSMode(struct vnt_private *priv) 
	else if (priv->byBBType == BB_TYPE_11G)

		vnt_control_out_u8(priv, MESSAGE_REQUEST_BBREG, 0x88, 0x08);



	vUpdateIFS(priv);

	vnt_update_ifs(priv);

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



	if (priv->byBBType == BB_TYPE_11A) {

drivers/staging/vt6656/card.h

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ struct vnt_private; 


void vnt_set_channel(struct vnt_private *, u32);

void CARDvSetRSPINF(struct vnt_private *, u8);

void vUpdateIFS(struct vnt_private *);

void vnt_update_ifs(struct vnt_private *);

void CARDvUpdateBasicTopRate(struct vnt_private *);

void CARDbAddBasicRate(struct vnt_private *, u16);

int CARDbIsOFDMinBasicRate(struct vnt_private *pDevice);

drivers/staging/vt6656/wmgr.c

+7 −6
Original line number Diff line number Diff line
@@ -1659,7 +1659,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==true) 
                        } else {

                            MACvDisableProtectMD(pDevice);

                        }

                        vUpdateIFS(pDevice);

			vnt_update_ifs(pDevice);

                    }

                    if ((pBSSList->sERP.byERP & WLAN_EID_ERP_NONERP_PRESENT) != pDevice->bNonERPPresent) {//0000 0001

                        pDevice->bNonERPPresent = (pBSSList->sERP.byERP & WLAN_EID_ERP_USE_PROTECTION);
@@ -1690,7 +1690,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==true) 
                    if (bShortSlotTime != pDevice->bShortSlotTime) {

                        pDevice->bShortSlotTime = bShortSlotTime;

                        BBvSetShortSlotTime(pDevice);

                        vUpdateIFS(pDevice);

			vnt_update_ifs(pDevice);

                    }

                }
@@ -2337,7 +2337,8 @@ void vMgrJoinBSSBegin(struct vnt_private *pDevice, PCMD_STATUS pStatus) 
	    RATEvParseMaxRate((void *)pDevice, pItemRates, pItemExtRates, true,

                              &wMaxBasicRate, &wMaxSuppRate, &wSuppRate,

                              &byTopCCKBasicRate, &byTopOFDMBasicRate);

            vUpdateIFS(pDevice);



	    vnt_update_ifs(pDevice);

            // TODO: deal with if wCapInfo the privacy is on, but station WEP is off

            // TODO: deal with if wCapInfo the PS-Pollable is on.

            pMgmt->wCurrBeaconPeriod = pCurr->wBeaconInterval;
@@ -2391,7 +2392,7 @@ void vMgrJoinBSSBegin(struct vnt_private *pDevice, PCMD_STATUS pStatus) 
                    } else {

                        MACvDisableProtectMD(pDevice);

                    }

                    vUpdateIFS(pDevice);

		    vnt_update_ifs(pDevice);

                }

                if ((pCurr->sERP.byERP & WLAN_EID_ERP_NONERP_PRESENT) != pDevice->bNonERPPresent) {//0000 0001

                    pDevice->bNonERPPresent = (pCurr->sERP.byERP & WLAN_EID_ERP_USE_PROTECTION);
@@ -2421,7 +2422,7 @@ void vMgrJoinBSSBegin(struct vnt_private *pDevice, PCMD_STATUS pStatus) 
                if (bShortSlotTime != pDevice->bShortSlotTime) {

                    pDevice->bShortSlotTime = bShortSlotTime;

                    BBvSetShortSlotTime(pDevice);

                    vUpdateIFS(pDevice);

		    vnt_update_ifs(pDevice);

                }

            }
@@ -2480,7 +2481,7 @@ void vMgrJoinBSSBegin(struct vnt_private *pDevice, PCMD_STATUS pStatus) 
			      (PWLAN_IE_SUPP_RATES)pMgmt->abyCurrSuppRates,

                              NULL, true, &wMaxBasicRate, &wMaxSuppRate, &wSuppRate,

                              &byTopCCKBasicRate, &byTopOFDMBasicRate);

            vUpdateIFS(pDevice);

	    vnt_update_ifs(pDevice);

            pMgmt->wCurrCapInfo = pCurr->wCapInfo;

            pMgmt->wCurrBeaconPeriod = pCurr->wBeaconInterval;

            memset(pMgmt->abyCurrSSID, 0, WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN);