staging: vt6656: rename MACvDisableProtectMD to vnt_mac_disable_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 e335a4db83d081f5e8efc3c44d4c672396a1aac1..093b583eab0ab818ea099f4a187191239a4c337d 100644 (file)
--- a/drivers/staging/vt6656/bssdb.c
+++ b/drivers/staging/vt6656/bssdb.c
@@ -950,7 +950,7 @@ void BSSvSecondCallBack(struct work_struct *work)
                                pDevice->bProtectMode = true;
                        }
                } else if (pDevice->bProtectMode) {
-                       MACvDisableProtectMD(pDevice);
+                       vnt_mac_disable_protect_mode(pDevice);
                        pDevice->bProtectMode = false;
                }
                /* on/off short slot time */

diff --git a/drivers/staging/vt6656/mac.c b/drivers/staging/vt6656/mac.c
index 1319b8ae66f2e90219ebb86be10f972e8b871a5e..96fff70d75f9e0d994676c6a83e56bc0671bd4f0 100644 (file)
--- a/drivers/staging/vt6656/mac.c
+++ b/drivers/staging/vt6656/mac.c
@@ -197,7 +197,7 @@ void vnt_mac_enable_protect_mode(struct vnt_private *priv)
                MAC_REG_ENCFG0, MESSAGE_REQUEST_MACREG, ARRAY_SIZE(data), data);
 }
 
-void MACvDisableProtectMD(struct vnt_private *priv)
+void vnt_mac_disable_protect_mode(struct vnt_private *priv)
 {
        u8 data[2];
 

diff --git a/drivers/staging/vt6656/mac.h b/drivers/staging/vt6656/mac.h
index fa3cfc28a11a9b36b1abbc13aa88d25eb85dec02..effab75447e520ce3882880f100c4c0bc05a3c64 100644 (file)
--- a/drivers/staging/vt6656/mac.h
+++ b/drivers/staging/vt6656/mac.h
@@ -424,7 +424,7 @@ 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 vnt_mac_enable_protect_mode(struct vnt_private *);
-void MACvDisableProtectMD(struct vnt_private *);
+void vnt_mac_disable_protect_mode(struct vnt_private *);
 void MACvEnableBarkerPreambleMd(struct vnt_private *);
 void MACvDisableBarkerPreambleMd(struct vnt_private *);
 void MACvWriteBeaconInterval(struct vnt_private *, u16);

diff --git a/drivers/staging/vt6656/wmgr.c b/drivers/staging/vt6656/wmgr.c
index bb1242c14c2a69ccb8a58273ad15d17452a6b7ba..f35fdd8bd714adbf3a31d59088c42bdbfcc255d0 100644 (file)
--- a/drivers/staging/vt6656/wmgr.c
+++ b/drivers/staging/vt6656/wmgr.c
@@ -1657,7 +1657,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==true)
                         if (pDevice->bProtectMode) {
                            vnt_mac_enable_protect_mode(pDevice);
                         } else {
-                            MACvDisableProtectMD(pDevice);
+                           vnt_mac_disable_protect_mode(pDevice);
                         }
                        vnt_update_ifs(pDevice);
                     }
@@ -2031,7 +2031,7 @@ void vMgrCreateOwnIBSS(struct vnt_private *pDevice, PCMD_STATUS pStatus)
 
     // Disable Protect Mode
     pDevice->bProtectMode = 0;
-    MACvDisableProtectMD(pDevice);
+    vnt_mac_disable_protect_mode(pDevice);
 
     pDevice->bBarkerPreambleMd = 0;
     MACvDisableBarkerPreambleMd(pDevice);
@@ -2389,7 +2389,7 @@ void vMgrJoinBSSBegin(struct vnt_private *pDevice, PCMD_STATUS pStatus)
                     if (pDevice->bProtectMode) {
                        vnt_mac_enable_protect_mode(pDevice);
                     } else {
-                        MACvDisableProtectMD(pDevice);
+                       vnt_mac_disable_protect_mode(pDevice);
                     }
                    vnt_update_ifs(pDevice);
                 }
@@ -2565,7 +2565,7 @@ static void s_vMgrSynchBSS(struct vnt_private *pDevice, u32 uBSSMode,
 
     // Init the BSS informations
     pDevice->bProtectMode = false;
-    MACvDisableProtectMD(pDevice);
+    vnt_mac_disable_protect_mode(pDevice);
     pDevice->bBarkerPreambleMd = false;
     MACvDisableBarkerPreambleMd(pDevice);
     pDevice->bNonERPPresent = false;