git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1cd34ea
)
staging: vt6656: rename MACvEnableProtectMD to vnt_mac_enable_protect_mode
author
Malcolm Priestley
<tvboxspy@gmail.com>
Sat, 31 May 2014 10:50:45 +0000
(11:50 +0100)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Thu, 19 Jun 2014 22:57:38 +0000
(15:57 -0700)
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/vt6656/bssdb.c
patch
|
blob
|
history
drivers/staging/vt6656/mac.c
patch
|
blob
|
history
drivers/staging/vt6656/mac.h
patch
|
blob
|
history
drivers/staging/vt6656/wmgr.c
patch
|
blob
|
history
diff --git
a/drivers/staging/vt6656/bssdb.c
b/drivers/staging/vt6656/bssdb.c
index
fd7ed1d
..
e335a4d
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 --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