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

staging: vt6656: rename MACvEnableBarkerPreambleMd to vnt_mac_enable_barker_preamble_mode

Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 83a0ee45
...@@ -971,7 +971,7 @@ void BSSvSecondCallBack(struct work_struct *work) ...@@ -971,7 +971,7 @@ void BSSvSecondCallBack(struct work_struct *work)
if (uLongPreambleSTACnt > 0) { if (uLongPreambleSTACnt > 0) {
if (!pDevice->bBarkerPreambleMd) { if (!pDevice->bBarkerPreambleMd) {
MACvEnableBarkerPreambleMd(pDevice); vnt_mac_enable_barker_preamble_mode(pDevice);
pDevice->bBarkerPreambleMd = true; pDevice->bBarkerPreambleMd = true;
} }
} else if (pDevice->bBarkerPreambleMd) { } else if (pDevice->bBarkerPreambleMd) {
......
...@@ -208,7 +208,7 @@ void vnt_mac_disable_protect_mode(struct vnt_private *priv) ...@@ -208,7 +208,7 @@ void vnt_mac_disable_protect_mode(struct vnt_private *priv)
MAC_REG_ENCFG0, MESSAGE_REQUEST_MACREG, ARRAY_SIZE(data), data); MAC_REG_ENCFG0, MESSAGE_REQUEST_MACREG, ARRAY_SIZE(data), data);
} }
void MACvEnableBarkerPreambleMd(struct vnt_private *priv) void vnt_mac_enable_barker_preamble_mode(struct vnt_private *priv)
{ {
u8 data[2]; u8 data[2];
......
...@@ -425,7 +425,7 @@ void vnt_mac_write_word(struct vnt_private *, u8, u16); ...@@ -425,7 +425,7 @@ void vnt_mac_write_word(struct vnt_private *, u8, u16);
void vnt_mac_set_bssid_addr(struct vnt_private *, u8 *); 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 MACvEnableBarkerPreambleMd(struct vnt_private *); void vnt_mac_enable_barker_preamble_mode(struct vnt_private *);
void MACvDisableBarkerPreambleMd(struct vnt_private *); void MACvDisableBarkerPreambleMd(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);
......
...@@ -1668,7 +1668,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==true) ...@@ -1668,7 +1668,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==true)
pDevice->bBarkerPreambleMd = (pBSSList->sERP.byERP & WLAN_EID_ERP_BARKER_MODE); pDevice->bBarkerPreambleMd = (pBSSList->sERP.byERP & WLAN_EID_ERP_BARKER_MODE);
//BarkerPreambleMd has higher priority than shortPreamble bit in Cap //BarkerPreambleMd has higher priority than shortPreamble bit in Cap
if (pDevice->bBarkerPreambleMd) { if (pDevice->bBarkerPreambleMd) {
MACvEnableBarkerPreambleMd(pDevice); vnt_mac_enable_barker_preamble_mode(pDevice);
} else { } else {
MACvDisableBarkerPreambleMd(pDevice); MACvDisableBarkerPreambleMd(pDevice);
} }
...@@ -2400,7 +2400,7 @@ void vMgrJoinBSSBegin(struct vnt_private *pDevice, PCMD_STATUS pStatus) ...@@ -2400,7 +2400,7 @@ void vMgrJoinBSSBegin(struct vnt_private *pDevice, PCMD_STATUS pStatus)
pDevice->bBarkerPreambleMd = (pCurr->sERP.byERP & WLAN_EID_ERP_BARKER_MODE); pDevice->bBarkerPreambleMd = (pCurr->sERP.byERP & WLAN_EID_ERP_BARKER_MODE);
//BarkerPreambleMd has higher priority than shortPreamble bit in Cap //BarkerPreambleMd has higher priority than shortPreamble bit in Cap
if (pDevice->bBarkerPreambleMd) { if (pDevice->bBarkerPreambleMd) {
MACvEnableBarkerPreambleMd(pDevice); vnt_mac_enable_barker_preamble_mode(pDevice);
} else { } else {
MACvDisableBarkerPreambleMd(pDevice); MACvDisableBarkerPreambleMd(pDevice);
} }
......
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