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 e335a4d..093b583 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 --cc drivers/staging/vt6656/mac.c
Simple merge

diff --cc drivers/staging/vt6656/mac.h
Simple merge

diff --cc drivers/staging/vt6656/wmgr.c
Simple merge