From 084fc8f31a9296a832ab1f81856955a35e47624e Mon Sep 17 00:00:00 2001 From: Malcolm Priestley Date: Fri, 30 May 2014 16:27:40 +0100 Subject: [PATCH] staging: vt6656: rename CARDbSetMediaChannel to vnt_set_channel Drop card and media and just use vnt_set_channel. Signed-off-by: Malcolm Priestley Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6656/card.c | 2 +- drivers/staging/vt6656/card.h | 2 +- drivers/staging/vt6656/main_usb.c | 3 ++- drivers/staging/vt6656/wcmd.c | 6 +++--- drivers/staging/vt6656/wmgr.c | 4 ++-- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/drivers/staging/vt6656/card.c b/drivers/staging/vt6656/card.c index d662e5431dad..f8ba75bcfc16 100644 --- a/drivers/staging/vt6656/card.c +++ b/drivers/staging/vt6656/card.c @@ -75,7 +75,7 @@ static const u16 cwRXBCNTSFOff[MAX_RATE] = * Out: * none */ -void CARDbSetMediaChannel(struct vnt_private *priv, u32 connection_channel) +void vnt_set_channel(struct vnt_private *priv, u32 connection_channel) { if (priv->byBBType == BB_TYPE_11A) { diff --git a/drivers/staging/vt6656/card.h b/drivers/staging/vt6656/card.h index ac734714c7d1..06498ef82885 100644 --- a/drivers/staging/vt6656/card.h +++ b/drivers/staging/vt6656/card.h @@ -45,7 +45,7 @@ typedef enum _CARD_PHY_TYPE { struct vnt_private; -void CARDbSetMediaChannel(struct vnt_private *pDevice, u32 uConnectionChannel); +void vnt_set_channel(struct vnt_private *, u32); void CARDvSetRSPINF(struct vnt_private *, u8); void vUpdateIFS(struct vnt_private *); void CARDvUpdateBasicTopRate(struct vnt_private *); diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c index e18071f121c5..aca486dc391d 100644 --- a/drivers/staging/vt6656/main_usb.c +++ b/drivers/staging/vt6656/main_usb.c @@ -500,7 +500,8 @@ static int device_init_registers(struct vnt_private *pDevice) pMgmt->eScanType = WMAC_SCAN_PASSIVE; pMgmt->uCurrChannel = pDevice->uChannel; pMgmt->uIBSSChannel = pDevice->uChannel; - CARDbSetMediaChannel(pDevice, pMgmt->uCurrChannel); + + vnt_set_channel(pDevice, pMgmt->uCurrChannel); /* get permanent network address */ memcpy(pDevice->abyPermanentNetAddr, init_rsp->net_addr, 6); diff --git a/drivers/staging/vt6656/wcmd.c b/drivers/staging/vt6656/wcmd.c index da72d4df6fca..cec6fc6dc6b7 100644 --- a/drivers/staging/vt6656/wcmd.c +++ b/drivers/staging/vt6656/wcmd.c @@ -341,7 +341,7 @@ void vRunCommand(struct work_struct *work) } DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Scanning.... channel: [%d]\n", pMgmt->uScanChannel); // Set channel - CARDbSetMediaChannel(pDevice, pMgmt->uScanChannel); + vnt_set_channel(pDevice, pMgmt->uScanChannel); // Set Baseband to be more sensitive. BBvSetShortSlotTime(pDevice); @@ -387,7 +387,7 @@ void vRunCommand(struct work_struct *work) // Set channel back vAdHocBeaconRestart(pDevice); // Set channel back - CARDbSetMediaChannel(pDevice, pMgmt->uCurrChannel); + vnt_set_channel(pDevice, pMgmt->uCurrChannel); // Set Filter if (pMgmt->bCurrBSSIDFilterOn) { MACvRegBitsOn(pDevice, MAC_REG_RCR, RCR_BSSID); @@ -876,7 +876,7 @@ void vRunCommand(struct work_struct *work) break; case WLAN_CMD_11H_CHSW_START: - CARDbSetMediaChannel(pDevice, pDevice->byNewChannel); + vnt_set_channel(pDevice, pDevice->byNewChannel); pDevice->bChannelSwitch = false; pMgmt->uCurrChannel = pDevice->byNewChannel; pDevice->bStopDataPkt = false; diff --git a/drivers/staging/vt6656/wmgr.c b/drivers/staging/vt6656/wmgr.c index 18723eab93d2..c30782fefbd2 100644 --- a/drivers/staging/vt6656/wmgr.c +++ b/drivers/staging/vt6656/wmgr.c @@ -2059,7 +2059,7 @@ void vMgrCreateOwnIBSS(struct vnt_private *pDevice, PCMD_STATUS pStatus) pMgmt->uIBSSChannel = DEFAULT_IBSS_CHANNEL; // set channel and clear NAV - CARDbSetMediaChannel(pDevice, pMgmt->uIBSSChannel); + vnt_set_channel(pDevice, pMgmt->uIBSSChannel); pMgmt->uCurrChannel = pMgmt->uIBSSChannel; pDevice->byPreambleType = pDevice->byShortPreamble; @@ -2642,7 +2642,7 @@ static void s_vMgrSynchBSS(struct vnt_private *pDevice, u32 uBSSMode, } // set channel and clear NAV - CARDbSetMediaChannel(pDevice, pCurr->uChannel); + vnt_set_channel(pDevice, pCurr->uChannel); pMgmt->uCurrChannel = pCurr->uChannel; DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "<----s_bSynchBSS Set Channel [%d]\n", pCurr->uChannel); -- 2.34.1