summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMalcolm Priestley <tvboxspy@gmail.com>2014-05-31 11:50:49 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-06-19 15:57:38 -0700
commit4cada363eef28474483f0623590084f7d612891c (patch)
treedf439b25a7d48d6600d9ed451060f5cf60ff1c51
parent05827c93df800e3c79c3703e5620dbad979c8e8c (diff)
downloadlinux-4cada363eef28474483f0623590084f7d612891c.tar.gz
linux-4cada363eef28474483f0623590084f7d612891c.tar.bz2
linux-4cada363eef28474483f0623590084f7d612891c.zip
staging: vt6656: rename MACvWriteBeaconInterval to vnt_mac_set_beacon_interval
Drop write for set Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/vt6656/mac.c2
-rw-r--r--drivers/staging/vt6656/mac.h2
-rw-r--r--drivers/staging/vt6656/wmgr.c6
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/vt6656/mac.c b/drivers/staging/vt6656/mac.c
index 3275ee9fc2fd..b06436fdfbdd 100644
--- a/drivers/staging/vt6656/mac.c
+++ b/drivers/staging/vt6656/mac.c
@@ -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];
diff --git a/drivers/staging/vt6656/mac.h b/drivers/staging/vt6656/mac.h
index dfeacbfe5e54..eac2be793cb7 100644
--- a/drivers/staging/vt6656/mac.h
+++ b/drivers/staging/vt6656/mac.h
@@ -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__ */
diff --git a/drivers/staging/vt6656/wmgr.c b/drivers/staging/vt6656/wmgr.c
index 73c6e9019f2d..a1b5307e6caf 100644
--- a/drivers/staging/vt6656/wmgr.c
+++ b/drivers/staging/vt6656/wmgr.c
@@ -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