Commit bc240f54 authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman

staging: vt6656: rename CARDvSetBSSMode to vnt_set_bss_mode

drop card and rename to vnt_set_bss_mode
Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8a5e6c8c
...@@ -829,7 +829,7 @@ int vnt_radio_power_on(struct vnt_private *priv) ...@@ -829,7 +829,7 @@ int vnt_radio_power_on(struct vnt_private *priv)
return ret; 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) if (priv->byRFType == RF_AIROHA7230 && priv->byBBType == BB_TYPE_11A)
MACvSetBBType(priv, BB_TYPE_11G); MACvSetBBType(priv, BB_TYPE_11G);
......
...@@ -61,6 +61,6 @@ u64 vnt_get_tsf_offset(u8 byRxRate, u64 qwTSF1, u64 qwTSF2); ...@@ -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_off(struct vnt_private *);
int vnt_radio_power_on(struct vnt_private *); int vnt_radio_power_on(struct vnt_private *);
u8 vnt_get_pkt_type(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__ */ #endif /* __CARD_H__ */
...@@ -525,7 +525,7 @@ static int device_init_registers(struct vnt_private *pDevice) ...@@ -525,7 +525,7 @@ static int device_init_registers(struct vnt_private *pDevice)
} }
BBvSetShortSlotTime(pDevice); BBvSetShortSlotTime(pDevice);
CARDvSetBSSMode(pDevice); vnt_set_bss_mode(pDevice);
pDevice->byBBVGACurrent = pDevice->abyBBVGA[0]; pDevice->byBBVGACurrent = pDevice->abyBBVGA[0];
pDevice->byBBVGANew = pDevice->byBBVGACurrent; pDevice->byBBVGANew = pDevice->byBBVGACurrent;
......
...@@ -333,11 +333,11 @@ void vRunCommand(struct work_struct *work) ...@@ -333,11 +333,11 @@ void vRunCommand(struct work_struct *work)
if ((pDevice->byBBType != BB_TYPE_11A) && if ((pDevice->byBBType != BB_TYPE_11A) &&
(pMgmt->uScanChannel > CB_MAX_CHANNEL_24G)) { (pMgmt->uScanChannel > CB_MAX_CHANNEL_24G)) {
pDevice->byBBType = BB_TYPE_11A; pDevice->byBBType = BB_TYPE_11A;
CARDvSetBSSMode(pDevice); vnt_set_bss_mode(pDevice);
} else if ((pDevice->byBBType == BB_TYPE_11A) && } else if ((pDevice->byBBType == BB_TYPE_11A) &&
(pMgmt->uScanChannel <= CB_MAX_CHANNEL_24G)) { (pMgmt->uScanChannel <= CB_MAX_CHANNEL_24G)) {
pDevice->byBBType = BB_TYPE_11G; 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); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Scanning.... channel: [%d]\n", pMgmt->uScanChannel);
// Set channel // Set channel
...@@ -377,7 +377,7 @@ void vRunCommand(struct work_struct *work) ...@@ -377,7 +377,7 @@ void vRunCommand(struct work_struct *work)
// Set Baseband's sensitivity back. // Set Baseband's sensitivity back.
if (pDevice->byBBType != pDevice->byScanBBType) { if (pDevice->byBBType != pDevice->byScanBBType) {
pDevice->byBBType = pDevice->byScanBBType; pDevice->byBBType = pDevice->byScanBBType;
CARDvSetBSSMode(pDevice); vnt_set_bss_mode(pDevice);
} }
BBvSetShortSlotTime(pDevice); BBvSetShortSlotTime(pDevice);
......
...@@ -2081,7 +2081,7 @@ void vMgrCreateOwnIBSS(struct vnt_private *pDevice, PCMD_STATUS pStatus) ...@@ -2081,7 +2081,7 @@ void vMgrCreateOwnIBSS(struct vnt_private *pDevice, PCMD_STATUS pStatus)
// vUpdateIFS() use pDevice->bShortSlotTime as parameter so it must be called // vUpdateIFS() use pDevice->bShortSlotTime as parameter so it must be called
// after setting ShortSlotTime. // after setting ShortSlotTime.
// CARDvSetBSSMode call vUpdateIFS() // CARDvSetBSSMode call vUpdateIFS()
CARDvSetBSSMode(pDevice); vnt_set_bss_mode(pDevice);
if (pMgmt->eConfigMode == WMAC_CONFIG_AP) { if (pMgmt->eConfigMode == WMAC_CONFIG_AP) {
MACvRegBitsOn(pDevice, MAC_REG_HOSTCR, HOSTCR_AP); MACvRegBitsOn(pDevice, MAC_REG_HOSTCR, HOSTCR_AP);
...@@ -2601,7 +2601,7 @@ static void s_vMgrSynchBSS(struct vnt_private *pDevice, u32 uBSSMode, ...@@ -2601,7 +2601,7 @@ static void s_vMgrSynchBSS(struct vnt_private *pDevice, u32 uBSSMode,
pMgmt->eCurrentPHYMode = PHY_TYPE_11A; pMgmt->eCurrentPHYMode = PHY_TYPE_11A;
pDevice->bShortSlotTime = true; pDevice->bShortSlotTime = true;
BBvSetShortSlotTime(pDevice); BBvSetShortSlotTime(pDevice);
CARDvSetBSSMode(pDevice); vnt_set_bss_mode(pDevice);
} else { } else {
return; return;
} }
...@@ -2613,7 +2613,7 @@ static void s_vMgrSynchBSS(struct vnt_private *pDevice, u32 uBSSMode, ...@@ -2613,7 +2613,7 @@ static void s_vMgrSynchBSS(struct vnt_private *pDevice, u32 uBSSMode,
pMgmt->eCurrentPHYMode = PHY_TYPE_11B; pMgmt->eCurrentPHYMode = PHY_TYPE_11B;
pDevice->bShortSlotTime = false; pDevice->bShortSlotTime = false;
BBvSetShortSlotTime(pDevice); BBvSetShortSlotTime(pDevice);
CARDvSetBSSMode(pDevice); vnt_set_bss_mode(pDevice);
} else { } else {
return; return;
} }
...@@ -2624,12 +2624,12 @@ static void s_vMgrSynchBSS(struct vnt_private *pDevice, u32 uBSSMode, ...@@ -2624,12 +2624,12 @@ static void s_vMgrSynchBSS(struct vnt_private *pDevice, u32 uBSSMode,
pMgmt->eCurrentPHYMode = PHY_TYPE_11G; pMgmt->eCurrentPHYMode = PHY_TYPE_11G;
pDevice->bShortSlotTime = true; pDevice->bShortSlotTime = true;
BBvSetShortSlotTime(pDevice); BBvSetShortSlotTime(pDevice);
CARDvSetBSSMode(pDevice); vnt_set_bss_mode(pDevice);
} else if (pDevice->eConfigPHYMode == PHY_TYPE_11B) { } else if (pDevice->eConfigPHYMode == PHY_TYPE_11B) {
pDevice->byBBType = BB_TYPE_11B; pDevice->byBBType = BB_TYPE_11B;
pDevice->bShortSlotTime = false; pDevice->bShortSlotTime = false;
BBvSetShortSlotTime(pDevice); BBvSetShortSlotTime(pDevice);
CARDvSetBSSMode(pDevice); vnt_set_bss_mode(pDevice);
} else { } else {
return; return;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment