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

staging: vt6656: rename MACvWriteBeaconInterval to vnt_mac_set_beacon_interval 



Drop write for set

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

drivers/staging/vt6656/mac.c

+1 −1
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ void vnt_mac_disable_barker_preamble_mode(struct vnt_private *priv) 
		MAC_REG_ENCFG2, MESSAGE_REQUEST_MACREG, ARRAY_SIZE(data), data);

}



void MACvWriteBeaconInterval(struct vnt_private *priv, u16 interval)

void vnt_mac_set_beacon_interval(struct vnt_private *priv, u16 interval)

{

	u8 data[2];

drivers/staging/vt6656/mac.h

+1 −1
Original line number Diff line number Diff line
@@ -427,7 +427,7 @@ void vnt_mac_enable_protect_mode(struct vnt_private *); 
void vnt_mac_disable_protect_mode(struct vnt_private *);

void vnt_mac_enable_barker_preamble_mode(struct vnt_private *);

void vnt_mac_disable_barker_preamble_mode(struct vnt_private *);

void MACvWriteBeaconInterval(struct vnt_private *, u16);

void vnt_mac_set_beacon_interval(struct vnt_private *, u16);

void vnt_mac_set_led(struct vnt_private *priv, u8, u8);



#endif /* __MAC_H__ */

drivers/staging/vt6656/wmgr.c

+3 −3
Original line number Diff line number Diff line
@@ -1915,7 +1915,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==true) 
                     // set HW beacon interval and re-synchronizing....

                     DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Rejoining to Other Adhoc group with same SSID........\n");



                     MACvWriteBeaconInterval(pDevice, pMgmt->wCurrBeaconPeriod);

		     vnt_mac_set_beacon_interval(pDevice, pMgmt->wCurrBeaconPeriod);

		     vnt_adjust_tsf(pDevice, pRxPacket->byRxRate, qwTimestamp, pRxPacket->qwLocalTSF);

		     vnt_update_next_tbtt(pDevice, qwTimestamp, pMgmt->wCurrBeaconPeriod);
@@ -2041,7 +2041,7 @@ void vMgrCreateOwnIBSS(struct vnt_private *pDevice, PCMD_STATUS pStatus) 
    // set HW beacon interval

    if (pMgmt->wIBSSBeaconPeriod == 0)

        pMgmt->wIBSSBeaconPeriod = DEFAULT_IBSS_BI;

    MACvWriteBeaconInterval(pDevice, pMgmt->wIBSSBeaconPeriod);

    vnt_mac_set_beacon_interval(pDevice, pMgmt->wIBSSBeaconPeriod);



    vnt_get_current_tsf(pDevice, &qwCurrTSF);

    // clear TSF counter
@@ -2579,7 +2579,7 @@ static void s_vMgrSynchBSS(struct vnt_private *pDevice, u32 uBSSMode, 
    vnt_adjust_tsf(pDevice, pCurr->byRxRate, pCurr->qwBSSTimestamp, pCurr->qwLocalTSF);



    // set HW beacon interval

    MACvWriteBeaconInterval(pDevice, pCurr->wBeaconInterval);

    vnt_mac_set_beacon_interval(pDevice, pCurr->wBeaconInterval);



    // set Next TBTT

    // Next TBTT = ((local_current_TSF / beacon_interval) + 1 ) * beacon_interval