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

staging: vt6656: rename MACvEnableProtectMD to vnt_mac_enable_protect_mode

Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1cd34eaa
...@@ -946,7 +946,7 @@ void BSSvSecondCallBack(struct work_struct *work) ...@@ -946,7 +946,7 @@ void BSSvSecondCallBack(struct work_struct *work)
/* on/off protect mode */ /* on/off protect mode */
if (WLAN_GET_ERP_USE_PROTECTION(pDevice->byERPFlag)) { if (WLAN_GET_ERP_USE_PROTECTION(pDevice->byERPFlag)) {
if (!pDevice->bProtectMode) { if (!pDevice->bProtectMode) {
MACvEnableProtectMD(pDevice); vnt_mac_enable_protect_mode(pDevice);
pDevice->bProtectMode = true; pDevice->bProtectMode = true;
} }
} else if (pDevice->bProtectMode) { } else if (pDevice->bProtectMode) {
......
...@@ -186,7 +186,7 @@ void vnt_mac_set_bssid_addr(struct vnt_private *priv, u8 *addr) ...@@ -186,7 +186,7 @@ void vnt_mac_set_bssid_addr(struct vnt_private *priv, u8 *addr)
MESSAGE_REQUEST_MACREG, ETH_ALEN, addr); MESSAGE_REQUEST_MACREG, ETH_ALEN, addr);
} }
void MACvEnableProtectMD(struct vnt_private *priv) void vnt_mac_enable_protect_mode(struct vnt_private *priv)
{ {
u8 data[2]; u8 data[2];
......
...@@ -423,7 +423,7 @@ void vnt_mac_reg_bits_off(struct vnt_private *, u8, u8); ...@@ -423,7 +423,7 @@ void vnt_mac_reg_bits_off(struct vnt_private *, u8, u8);
void vnt_mac_reg_bits_on(struct vnt_private *, u8, u8); void vnt_mac_reg_bits_on(struct vnt_private *, u8, u8);
void vnt_mac_write_word(struct vnt_private *, u8, u16); 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 MACvEnableProtectMD(struct vnt_private *); void vnt_mac_enable_protect_mode(struct vnt_private *);
void MACvDisableProtectMD(struct vnt_private *); void MACvDisableProtectMD(struct vnt_private *);
void MACvEnableBarkerPreambleMd(struct vnt_private *); void MACvEnableBarkerPreambleMd(struct vnt_private *);
void MACvDisableBarkerPreambleMd(struct vnt_private *); void MACvDisableBarkerPreambleMd(struct vnt_private *);
......
...@@ -1655,7 +1655,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==true) ...@@ -1655,7 +1655,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==true)
if ((pBSSList->sERP.byERP & WLAN_EID_ERP_USE_PROTECTION) != pDevice->bProtectMode) {//0000 0010 if ((pBSSList->sERP.byERP & WLAN_EID_ERP_USE_PROTECTION) != pDevice->bProtectMode) {//0000 0010
pDevice->bProtectMode = (pBSSList->sERP.byERP & WLAN_EID_ERP_USE_PROTECTION); pDevice->bProtectMode = (pBSSList->sERP.byERP & WLAN_EID_ERP_USE_PROTECTION);
if (pDevice->bProtectMode) { if (pDevice->bProtectMode) {
MACvEnableProtectMD(pDevice); vnt_mac_enable_protect_mode(pDevice);
} else { } else {
MACvDisableProtectMD(pDevice); MACvDisableProtectMD(pDevice);
} }
...@@ -2387,7 +2387,7 @@ void vMgrJoinBSSBegin(struct vnt_private *pDevice, PCMD_STATUS pStatus) ...@@ -2387,7 +2387,7 @@ void vMgrJoinBSSBegin(struct vnt_private *pDevice, PCMD_STATUS pStatus)
if ((pCurr->sERP.byERP & WLAN_EID_ERP_USE_PROTECTION) != pDevice->bProtectMode) {//0000 0010 if ((pCurr->sERP.byERP & WLAN_EID_ERP_USE_PROTECTION) != pDevice->bProtectMode) {//0000 0010
pDevice->bProtectMode = (pCurr->sERP.byERP & WLAN_EID_ERP_USE_PROTECTION); pDevice->bProtectMode = (pCurr->sERP.byERP & WLAN_EID_ERP_USE_PROTECTION);
if (pDevice->bProtectMode) { if (pDevice->bProtectMode) {
MACvEnableProtectMD(pDevice); vnt_mac_enable_protect_mode(pDevice);
} else { } else {
MACvDisableProtectMD(pDevice); MACvDisableProtectMD(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