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

staging: vt6656: rename MACvDisableProtectMD to vnt_mac_disable_protect_mode

Browse source 
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-31 11:50:46 +01:00 • committed by Greg Kroah-Hartman
commit 83a0ee45f5
4 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -950,7 +950,7 @@ void BSSvSecondCallBack(struct work_struct *work)
pDevice->bProtectMode = true;
}
} else if (pDevice->bProtectMode) {
MACvDisableProtectMD(pDevice);
vnt_mac_disable_protect_mode(pDevice);
pDevice->bProtectMode = false;
}
/* on/off short slot time */

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

@ -197,7 +197,7 @@ void vnt_mac_enable_protect_mode(struct vnt_private *priv)
MAC_REG_ENCFG0, MESSAGE_REQUEST_MACREG, ARRAY_SIZE(data), data);
}
void MACvDisableProtectMD(struct vnt_private *priv)
void vnt_mac_disable_protect_mode(struct vnt_private *priv)
{
u8 data[2];

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

@ -424,7 +424,7 @@ void vnt_mac_reg_bits_on(struct vnt_private *, u8, u8);
void vnt_mac_write_word(struct vnt_private *, u8, u16);
void vnt_mac_set_bssid_addr(struct vnt_private *, u8 *);
void vnt_mac_enable_protect_mode(struct vnt_private *);
void MACvDisableProtectMD(struct vnt_private *);
void vnt_mac_disable_protect_mode(struct vnt_private *);
void MACvEnableBarkerPreambleMd(struct vnt_private *);
void MACvDisableBarkerPreambleMd(struct vnt_private *);
void MACvWriteBeaconInterval(struct vnt_private *, u16);

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

@ -1657,7 +1657,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==true)
if (pDevice->bProtectMode) {
vnt_mac_enable_protect_mode(pDevice);
} else {
MACvDisableProtectMD(pDevice);
vnt_mac_disable_protect_mode(pDevice);
}
vnt_update_ifs(pDevice);
}
@ -2031,7 +2031,7 @@ void vMgrCreateOwnIBSS(struct vnt_private *pDevice, PCMD_STATUS pStatus)
// Disable Protect Mode
pDevice->bProtectMode = 0;
MACvDisableProtectMD(pDevice);
vnt_mac_disable_protect_mode(pDevice);
pDevice->bBarkerPreambleMd = 0;
MACvDisableBarkerPreambleMd(pDevice);
@ -2389,7 +2389,7 @@ void vMgrJoinBSSBegin(struct vnt_private *pDevice, PCMD_STATUS pStatus)
if (pDevice->bProtectMode) {
vnt_mac_enable_protect_mode(pDevice);
} else {
MACvDisableProtectMD(pDevice);
vnt_mac_disable_protect_mode(pDevice);
}
vnt_update_ifs(pDevice);
}
@ -2565,7 +2565,7 @@ static void s_vMgrSynchBSS(struct vnt_private *pDevice, u32 uBSSMode,
// Init the BSS informations
pDevice->bProtectMode = false;
MACvDisableProtectMD(pDevice);
vnt_mac_disable_protect_mode(pDevice);
pDevice->bBarkerPreambleMd = false;
MACvDisableBarkerPreambleMd(pDevice);
pDevice->bNonERPPresent = false;