mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 05:48:40 +00:00
staging: vt6656: rename MACvRegBitsOff to vnt_mac_reg_bits_off
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
a7a93e3251
commit
a9bed1df5b
7 changed files with 15 additions and 15 deletions
|
@ -92,7 +92,7 @@ void vnt_set_channel(struct vnt_private *priv, u32 connection_channel)
|
|||
MACvRegBitsOn(priv, MAC_REG_MACCR, MACCR_CLRNAV);
|
||||
|
||||
/* Set Channel[7] = 0 to tell H/W channel is changing now. */
|
||||
MACvRegBitsOff(priv, MAC_REG_CHANNEL, 0xb0);
|
||||
vnt_mac_reg_bits_off(priv, MAC_REG_CHANNEL, 0xb0);
|
||||
|
||||
vnt_control_out(priv, MESSAGE_TYPE_SELECT_CHANNLE,
|
||||
connection_channel, 0, 0, NULL);
|
||||
|
@ -777,12 +777,12 @@ int vnt_radio_power_off(struct vnt_private *priv)
|
|||
case RF_VT3226:
|
||||
case RF_VT3226D0:
|
||||
case RF_VT3342A0:
|
||||
MACvRegBitsOff(priv, MAC_REG_SOFTPWRCTL,
|
||||
vnt_mac_reg_bits_off(priv, MAC_REG_SOFTPWRCTL,
|
||||
(SOFTPWRCTL_SWPE2 | SOFTPWRCTL_SWPE3));
|
||||
break;
|
||||
}
|
||||
|
||||
MACvRegBitsOff(priv, MAC_REG_HOSTCR, HOSTCR_RXON);
|
||||
vnt_mac_reg_bits_off(priv, MAC_REG_HOSTCR, HOSTCR_RXON);
|
||||
|
||||
BBvSetDeepSleep(priv);
|
||||
|
||||
|
|
|
@ -147,7 +147,7 @@ void vnt_mac_set_keyentry(struct vnt_private *priv, u16 key_ctl, u32 entry_idx,
|
|||
(u16)key_idx, sizeof(struct vnt_mac_set_key), (u8 *)&set_key);
|
||||
}
|
||||
|
||||
void MACvRegBitsOff(struct vnt_private *priv, u8 reg_ofs, u8 bits)
|
||||
void vnt_mac_reg_bits_off(struct vnt_private *priv, u8 reg_ofs, u8 bits)
|
||||
{
|
||||
u8 data[2];
|
||||
|
||||
|
|
|
@ -419,7 +419,7 @@ void vnt_mac_shutdown(struct vnt_private *);
|
|||
void vnt_mac_set_bb_type(struct vnt_private *, u8);
|
||||
void vnt_mac_disable_keyentry(struct vnt_private *, u8);
|
||||
void vnt_mac_set_keyentry(struct vnt_private *, u16, u32, u32, u8 *, u8 *);
|
||||
void MACvRegBitsOff(struct vnt_private *, u8, u8);
|
||||
void vnt_mac_reg_bits_off(struct vnt_private *, u8, u8);
|
||||
void MACvRegBitsOn(struct vnt_private *, u8, u8);
|
||||
void MACvWriteWord(struct vnt_private *, u8, u16);
|
||||
void MACvWriteBSSIDAddress(struct vnt_private *, u8 *);
|
||||
|
|
|
@ -546,7 +546,8 @@ static int device_init_registers(struct vnt_private *pDevice)
|
|||
pDevice->bHWRadioOff = true;
|
||||
MACvRegBitsOn(pDevice, MAC_REG_GPIOCTL1, GPIO3_INTMD);
|
||||
} else {
|
||||
MACvRegBitsOff(pDevice, MAC_REG_GPIOCTL1, GPIO3_INTMD);
|
||||
vnt_mac_reg_bits_off(pDevice, MAC_REG_GPIOCTL1,
|
||||
GPIO3_INTMD);
|
||||
pDevice->bHWRadioOff = false;
|
||||
}
|
||||
|
||||
|
|
|
@ -88,7 +88,7 @@ void PSvEnablePowerSaving(struct vnt_private *pDevice, u16 wListenInterval)
|
|||
if (wListenInterval >= 2) {
|
||||
|
||||
/* clear always listen beacon */
|
||||
MACvRegBitsOff(pDevice, MAC_REG_PSCTL, PSCTL_ALBCN);
|
||||
vnt_mac_reg_bits_off(pDevice, MAC_REG_PSCTL, PSCTL_ALBCN);
|
||||
|
||||
/* first time set listen next beacon */
|
||||
MACvRegBitsOn(pDevice, MAC_REG_PSCTL, PSCTL_LNBCN);
|
||||
|
@ -133,7 +133,7 @@ void PSvDisablePowerSaving(struct vnt_private *pDevice)
|
|||
0, 0, NULL);
|
||||
|
||||
/* clear AutoSleep */
|
||||
MACvRegBitsOff(pDevice, MAC_REG_PSCFG, PSCFG_AUTOSLEEP);
|
||||
vnt_mac_reg_bits_off(pDevice, MAC_REG_PSCFG, PSCFG_AUTOSLEEP);
|
||||
|
||||
/* set always listen beacon */
|
||||
MACvRegBitsOn(pDevice, MAC_REG_PSCTL, PSCTL_ALBCN);
|
||||
|
|
|
@ -111,7 +111,7 @@ static void vAdHocBeaconStop(struct vnt_private *pDevice)
|
|||
if (bStop) {
|
||||
//PMESG(("STOP_BEACON: IBSSChannel = %u, ScanChannel = %u\n",
|
||||
// pMgmt->uIBSSChannel, pMgmt->uScanChannel));
|
||||
MACvRegBitsOff(pDevice, MAC_REG_TCR, TCR_AUTOBCNTX);
|
||||
vnt_mac_reg_bits_off(pDevice, MAC_REG_TCR, TCR_AUTOBCNTX);
|
||||
}
|
||||
|
||||
} /* vAdHocBeaconStop */
|
||||
|
@ -325,7 +325,7 @@ void vRunCommand(struct work_struct *work)
|
|||
pDevice->byScanBBType = pDevice->byBBType; //lucas
|
||||
pDevice->bStopDataPkt = true;
|
||||
// Turn off RCR_BSSID filter every time
|
||||
MACvRegBitsOff(pDevice, MAC_REG_RCR, RCR_BSSID);
|
||||
vnt_mac_reg_bits_off(pDevice, MAC_REG_RCR, RCR_BSSID);
|
||||
pDevice->byRxMode &= ~RCR_BSSID;
|
||||
}
|
||||
//lucas
|
||||
|
@ -647,7 +647,7 @@ void vRunCommand(struct work_struct *work)
|
|||
KERN_INFO "vMgrCreateOwnIBSS fail!\n");
|
||||
}
|
||||
// always turn off unicast bit
|
||||
MACvRegBitsOff(pDevice, MAC_REG_RCR, RCR_UNICAST);
|
||||
vnt_mac_reg_bits_off(pDevice, MAC_REG_RCR, RCR_UNICAST);
|
||||
pDevice->byRxMode &= ~RCR_UNICAST;
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "wcmd: rx_mode = %x\n", pDevice->byRxMode);
|
||||
BSSvAddMulticastNode(pDevice);
|
||||
|
@ -808,7 +808,7 @@ void vRunCommand(struct work_struct *work)
|
|||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" WLAN_CMD_RADIO_START_ON........................\n");
|
||||
pDevice->bHWRadioOff = false;
|
||||
vnt_radio_power_on(pDevice);
|
||||
MACvRegBitsOff(pDevice, MAC_REG_GPIOCTL1, GPIO3_INTMD);
|
||||
vnt_mac_reg_bits_off(pDevice, MAC_REG_GPIOCTL1, GPIO3_INTMD);
|
||||
|
||||
vnt_mac_set_led(pDevice, LEDSTS_STS, LEDSTS_ON);
|
||||
}
|
||||
|
|
|
@ -1932,7 +1932,6 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==true)
|
|||
if (pDevice->byPreambleType != byOldPreambleType)
|
||||
vnt_set_rspinf(pDevice, (u8)pDevice->byBBType);
|
||||
|
||||
// MACvRegBitsOff(pDevice->PortOffset, MAC_REG_RCR, RCR_BSSID);
|
||||
// set highest basic rate
|
||||
// s_vSetHighestBasicRate(pDevice, (PWLAN_IE_SUPP_RATES)pMgmt->abyCurrSuppRates);
|
||||
// Prepare beacon frame
|
||||
|
@ -2561,7 +2560,7 @@ static void s_vMgrSynchBSS(struct vnt_private *pDevice, u32 uBSSMode,
|
|||
|
||||
// if previous mode is IBSS.
|
||||
if(pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) {
|
||||
MACvRegBitsOff(pDevice, MAC_REG_TCR, TCR_AUTOBCNTX);
|
||||
vnt_mac_reg_bits_off(pDevice, MAC_REG_TCR, TCR_AUTOBCNTX);
|
||||
}
|
||||
|
||||
// Init the BSS informations
|
||||
|
@ -2636,7 +2635,7 @@ static void s_vMgrSynchBSS(struct vnt_private *pDevice, u32 uBSSMode,
|
|||
}
|
||||
|
||||
if (uBSSMode == WMAC_MODE_ESS_STA) {
|
||||
MACvRegBitsOff(pDevice, MAC_REG_HOSTCR, HOSTCR_ADHOC);
|
||||
vnt_mac_reg_bits_off(pDevice, MAC_REG_HOSTCR, HOSTCR_ADHOC);
|
||||
MACvRegBitsOn(pDevice, MAC_REG_RCR, RCR_BSSID);
|
||||
pDevice->byRxMode |= RCR_BSSID;
|
||||
pMgmt->bCurrBSSIDFilterOn = true;
|
||||
|
|
Loading…
Reference in a new issue