staging: vt6656: rename vUpdateIFS to vnt_update_ifs

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 8e9ce96..fd7ed1d 100644 (file)
--- a/drivers/staging/vt6656/bssdb.c
+++ b/drivers/staging/vt6656/bssdb.c
@@ -959,12 +959,12 @@ void BSSvSecondCallBack(struct work_struct *work)
                        if (pDevice->bShortSlotTime) {
                                pDevice->bShortSlotTime = false;
                                BBvSetShortSlotTime(pDevice);
-                               vUpdateIFS((void *) pDevice);
+                               vnt_update_ifs(pDevice);
                        }
                } else if (!pDevice->bShortSlotTime) {
                                pDevice->bShortSlotTime = true;
                                BBvSetShortSlotTime(pDevice);
-                               vUpdateIFS((void *) pDevice);
+                               vnt_update_ifs(pDevice);
                }
 
                /* on/off barker long preamble mode */

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

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

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