forge/linux-uconsole
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

staging: vt6656: rename CARDvSetBSSMode to vnt_set_bss_mode

Browse source 
drop card and rename to vnt_set_bss_mode

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Malcolm Priestley 2014-05-30 23:22:54 +01:00 • committed by Greg Kroah-Hartman
commit bc240f54e5
5 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/staging/vt6656/card.c
View file

@ -829,7 +829,7 @@ int vnt_radio_power_on(struct vnt_private *priv)
return ret;
}
void CARDvSetBSSMode(struct vnt_private *priv)
void vnt_set_bss_mode(struct vnt_private *priv)
{
if (priv->byRFType == RF_AIROHA7230 && priv->byBBType == BB_TYPE_11A)
MACvSetBBType(priv, BB_TYPE_11G);

2
drivers/staging/vt6656/card.h
View file

@ -61,6 +61,6 @@ u64 vnt_get_tsf_offset(u8 byRxRate, u64 qwTSF1, u64 qwTSF2);
int vnt_radio_power_off(struct vnt_private *);
int vnt_radio_power_on(struct vnt_private *);
u8 vnt_get_pkt_type(struct vnt_private *);
void CARDvSetBSSMode(struct vnt_private *pDevice);
void vnt_set_bss_mode(struct vnt_private *);
#endif /* __CARD_H__ */

2
drivers/staging/vt6656/main_usb.c
View file

@ -525,7 +525,7 @@ static int device_init_registers(struct vnt_private *pDevice)
}
BBvSetShortSlotTime(pDevice);
CARDvSetBSSMode(pDevice);
vnt_set_bss_mode(pDevice);
pDevice->byBBVGACurrent = pDevice->abyBBVGA[0];
pDevice->byBBVGANew = pDevice->byBBVGACurrent;

6
drivers/staging/vt6656/wcmd.c
View file

@ -333,11 +333,11 @@ void vRunCommand(struct work_struct *work)
if ((pDevice->byBBType != BB_TYPE_11A) &&
(pMgmt->uScanChannel > CB_MAX_CHANNEL_24G)) {
pDevice->byBBType = BB_TYPE_11A;
CARDvSetBSSMode(pDevice);
vnt_set_bss_mode(pDevice);
} else if ((pDevice->byBBType == BB_TYPE_11A) &&
(pMgmt->uScanChannel <= CB_MAX_CHANNEL_24G)) {
pDevice->byBBType = BB_TYPE_11G;
CARDvSetBSSMode(pDevice);
vnt_set_bss_mode(pDevice);
}
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Scanning.... channel: [%d]\n", pMgmt->uScanChannel);
// Set channel
@ -377,7 +377,7 @@ void vRunCommand(struct work_struct *work)
// Set Baseband's sensitivity back.
if (pDevice->byBBType != pDevice->byScanBBType) {
pDevice->byBBType = pDevice->byScanBBType;
CARDvSetBSSMode(pDevice);
vnt_set_bss_mode(pDevice);
}
BBvSetShortSlotTime(pDevice);

10
drivers/staging/vt6656/wmgr.c
View file

@ -2081,7 +2081,7 @@ void vMgrCreateOwnIBSS(struct vnt_private *pDevice, PCMD_STATUS pStatus)
// vUpdateIFS() use pDevice->bShortSlotTime as parameter so it must be called
// after setting ShortSlotTime.
// CARDvSetBSSMode call vUpdateIFS()
CARDvSetBSSMode(pDevice);
vnt_set_bss_mode(pDevice);
if (pMgmt->eConfigMode == WMAC_CONFIG_AP) {
MACvRegBitsOn(pDevice, MAC_REG_HOSTCR, HOSTCR_AP);
@ -2601,7 +2601,7 @@ static void s_vMgrSynchBSS(struct vnt_private *pDevice, u32 uBSSMode,
pMgmt->eCurrentPHYMode = PHY_TYPE_11A;
pDevice->bShortSlotTime = true;
BBvSetShortSlotTime(pDevice);
CARDvSetBSSMode(pDevice);
vnt_set_bss_mode(pDevice);
} else {
return;
}
@ -2613,7 +2613,7 @@ static void s_vMgrSynchBSS(struct vnt_private *pDevice, u32 uBSSMode,
pMgmt->eCurrentPHYMode = PHY_TYPE_11B;
pDevice->bShortSlotTime = false;
BBvSetShortSlotTime(pDevice);
CARDvSetBSSMode(pDevice);
vnt_set_bss_mode(pDevice);
} else {
return;
}
@ -2624,12 +2624,12 @@ static void s_vMgrSynchBSS(struct vnt_private *pDevice, u32 uBSSMode,
pMgmt->eCurrentPHYMode = PHY_TYPE_11G;
pDevice->bShortSlotTime = true;
BBvSetShortSlotTime(pDevice);
CARDvSetBSSMode(pDevice);
vnt_set_bss_mode(pDevice);
} else if (pDevice->eConfigPHYMode == PHY_TYPE_11B) {
pDevice->byBBType = BB_TYPE_11B;
pDevice->bShortSlotTime = false;
BBvSetShortSlotTime(pDevice);
CARDvSetBSSMode(pDevice);
vnt_set_bss_mode(pDevice);
} else {
return;
}