diff options
| author | Malcolm Priestley <tvboxspy@gmail.com> | 2014-05-31 11:50:45 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-06-19 15:57:38 -0700 |
| commit | ccbf4415d613d49036005394aeb13c795992ae85 (patch) | |
| tree | 71ed8c3193533579b193ec7aa4399120198a22f4 | |
| parent | 1cd34eaa28dfca509f1713e327eaa0aaccbf0227 (diff) | |
staging: vt6656: rename MACvEnableProtectMD to vnt_mac_enable_protect_mode
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/vt6656/bssdb.c | 2 | ||||
| -rw-r--r-- | drivers/staging/vt6656/mac.c | 2 | ||||
| -rw-r--r-- | drivers/staging/vt6656/mac.h | 2 | ||||
| -rw-r--r-- | drivers/staging/vt6656/wmgr.c | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/vt6656/bssdb.c b/drivers/staging/vt6656/bssdb.c index fd7ed1de2fe7..e335a4db83d0 100644 --- a/drivers/staging/vt6656/bssdb.c +++ b/drivers/staging/vt6656/bssdb.c @@ -946,7 +946,7 @@ void BSSvSecondCallBack(struct work_struct *work) /* on/off protect mode */ if (WLAN_GET_ERP_USE_PROTECTION(pDevice->byERPFlag)) { if (!pDevice->bProtectMode) { - MACvEnableProtectMD(pDevice); + vnt_mac_enable_protect_mode(pDevice); pDevice->bProtectMode = true; } } else if (pDevice->bProtectMode) { diff --git a/drivers/staging/vt6656/mac.c b/drivers/staging/vt6656/mac.c index 1811d5f120b2..1319b8ae66f2 100644 --- a/drivers/staging/vt6656/mac.c +++ b/drivers/staging/vt6656/mac.c @@ -186,7 +186,7 @@ void vnt_mac_set_bssid_addr(struct vnt_private *priv, u8 *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]; diff --git a/drivers/staging/vt6656/mac.h b/drivers/staging/vt6656/mac.h index d2a44070e86d..fa3cfc28a11a 100644 --- a/drivers/staging/vt6656/mac.h +++ b/drivers/staging/vt6656/mac.h @@ -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_write_word(struct vnt_private *, u8, u16); 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 MACvEnableBarkerPreambleMd(struct vnt_private *); void MACvDisableBarkerPreambleMd(struct vnt_private *); diff --git a/drivers/staging/vt6656/wmgr.c b/drivers/staging/vt6656/wmgr.c index 0ed7cefa02e0..bb1242c14c2a 100644 --- a/drivers/staging/vt6656/wmgr.c +++ b/drivers/staging/vt6656/wmgr.c @@ -1655,7 +1655,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==true) if ((pBSSList->sERP.byERP & WLAN_EID_ERP_USE_PROTECTION) != pDevice->bProtectMode) {//0000 0010 pDevice->bProtectMode = (pBSSList->sERP.byERP & WLAN_EID_ERP_USE_PROTECTION); if (pDevice->bProtectMode) { - MACvEnableProtectMD(pDevice); + vnt_mac_enable_protect_mode(pDevice); } else { MACvDisableProtectMD(pDevice); } @@ -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 pDevice->bProtectMode = (pCurr->sERP.byERP & WLAN_EID_ERP_USE_PROTECTION); if (pDevice->bProtectMode) { - MACvEnableProtectMD(pDevice); + vnt_mac_enable_protect_mode(pDevice); } else { MACvDisableProtectMD(pDevice); } |