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>

diff --git a/drivers/staging/vt6656/bssdb.c b/drivers/staging/vt6656/bssdb.c
index fd7ed1de2fe7a9a5260f43ce16bee9c22199e32b..e335a4db83d081f5e8efc3c44d4c672396a1aac1 100644 (file)
--- 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 1811d5f120b229dbd7c607aad99e35c5d0424712..1319b8ae66f2e90219ebb86be10f972e8b871a5e 100644 (file)
--- 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 d2a44070e86df51c072392d7a52e25330d6515aa..fa3cfc28a11a9b36b1abbc13aa88d25eb85dec02 100644 (file)
--- 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 0ed7cefa02e0c76fe52dd0e124791253ffc38233..bb1242c14c2a69ccb8a58273ad15d17452a6b7ba 100644 (file)
--- 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);
                     }