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

staging: vt6656: rename MACvDisableBarkerPreambleMd to vnt_mac_disable_barker_preamble_mode

Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a085edc6
...@@ -975,7 +975,7 @@ void BSSvSecondCallBack(struct work_struct *work) ...@@ -975,7 +975,7 @@ void BSSvSecondCallBack(struct work_struct *work)
pDevice->bBarkerPreambleMd = true; pDevice->bBarkerPreambleMd = true;
} }
} else if (pDevice->bBarkerPreambleMd) { } else if (pDevice->bBarkerPreambleMd) {
MACvDisableBarkerPreambleMd(pDevice); vnt_mac_disable_barker_preamble_mode(pDevice);
pDevice->bBarkerPreambleMd = false; pDevice->bBarkerPreambleMd = false;
} }
......
...@@ -219,7 +219,7 @@ void vnt_mac_enable_barker_preamble_mode(struct vnt_private *priv) ...@@ -219,7 +219,7 @@ void vnt_mac_enable_barker_preamble_mode(struct vnt_private *priv)
MAC_REG_ENCFG2, MESSAGE_REQUEST_MACREG, ARRAY_SIZE(data), data); MAC_REG_ENCFG2, MESSAGE_REQUEST_MACREG, ARRAY_SIZE(data), data);
} }
void MACvDisableBarkerPreambleMd(struct vnt_private *priv) void vnt_mac_disable_barker_preamble_mode(struct vnt_private *priv)
{ {
u8 data[2]; u8 data[2];
......
...@@ -426,7 +426,7 @@ void vnt_mac_set_bssid_addr(struct vnt_private *, u8 *); ...@@ -426,7 +426,7 @@ void vnt_mac_set_bssid_addr(struct vnt_private *, u8 *);
void vnt_mac_enable_protect_mode(struct vnt_private *); void vnt_mac_enable_protect_mode(struct vnt_private *);
void vnt_mac_disable_protect_mode(struct vnt_private *); void vnt_mac_disable_protect_mode(struct vnt_private *);
void vnt_mac_enable_barker_preamble_mode(struct vnt_private *); void vnt_mac_enable_barker_preamble_mode(struct vnt_private *);
void MACvDisableBarkerPreambleMd(struct vnt_private *); void vnt_mac_disable_barker_preamble_mode(struct vnt_private *);
void MACvWriteBeaconInterval(struct vnt_private *, u16); void MACvWriteBeaconInterval(struct vnt_private *, u16);
void vnt_mac_set_led(struct vnt_private *priv, u8, u8); void vnt_mac_set_led(struct vnt_private *priv, u8, u8);
......
...@@ -1670,7 +1670,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==true) ...@@ -1670,7 +1670,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==true)
if (pDevice->bBarkerPreambleMd) { if (pDevice->bBarkerPreambleMd) {
vnt_mac_enable_barker_preamble_mode(pDevice); vnt_mac_enable_barker_preamble_mode(pDevice);
} else { } else {
MACvDisableBarkerPreambleMd(pDevice); vnt_mac_disable_barker_preamble_mode(pDevice);
} }
} }
} }
...@@ -2034,7 +2034,7 @@ void vMgrCreateOwnIBSS(struct vnt_private *pDevice, PCMD_STATUS pStatus) ...@@ -2034,7 +2034,7 @@ void vMgrCreateOwnIBSS(struct vnt_private *pDevice, PCMD_STATUS pStatus)
vnt_mac_disable_protect_mode(pDevice); vnt_mac_disable_protect_mode(pDevice);
pDevice->bBarkerPreambleMd = 0; pDevice->bBarkerPreambleMd = 0;
MACvDisableBarkerPreambleMd(pDevice); vnt_mac_disable_barker_preamble_mode(pDevice);
// Kyle Test 2003.11.04 // Kyle Test 2003.11.04
...@@ -2402,7 +2402,7 @@ void vMgrJoinBSSBegin(struct vnt_private *pDevice, PCMD_STATUS pStatus) ...@@ -2402,7 +2402,7 @@ void vMgrJoinBSSBegin(struct vnt_private *pDevice, PCMD_STATUS pStatus)
if (pDevice->bBarkerPreambleMd) { if (pDevice->bBarkerPreambleMd) {
vnt_mac_enable_barker_preamble_mode(pDevice); vnt_mac_enable_barker_preamble_mode(pDevice);
} else { } else {
MACvDisableBarkerPreambleMd(pDevice); vnt_mac_disable_barker_preamble_mode(pDevice);
} }
} }
} }
...@@ -2567,7 +2567,7 @@ static void s_vMgrSynchBSS(struct vnt_private *pDevice, u32 uBSSMode, ...@@ -2567,7 +2567,7 @@ static void s_vMgrSynchBSS(struct vnt_private *pDevice, u32 uBSSMode,
pDevice->bProtectMode = false; pDevice->bProtectMode = false;
vnt_mac_disable_protect_mode(pDevice); vnt_mac_disable_protect_mode(pDevice);
pDevice->bBarkerPreambleMd = false; pDevice->bBarkerPreambleMd = false;
MACvDisableBarkerPreambleMd(pDevice); vnt_mac_disable_barker_preamble_mode(pDevice);
pDevice->bNonERPPresent = false; pDevice->bNonERPPresent = false;
pDevice->byPreambleType = 0; pDevice->byPreambleType = 0;
pDevice->wBasicRate = 0; pDevice->wBasicRate = 0;
......
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