summaryrefslogtreecommitdiffstats
path: root/drivers/staging/vt6656/tkip.h
diff options
context:
space:
mode:
authorJim Lieb2009-08-12 23:54:08 +0200
committerGreg Kroah-Hartman2009-09-15 21:02:07 +0200
commit9d26d60f99855056a20ac7c0b68eb5ed04619831 (patch)
tree78c5c3c05f639051eb0be9c38ed4fdf6a9f78fa4 /drivers/staging/vt6656/tkip.h
parentStaging: vt665x: Typedef and macro cleanup Part 2 (diff)
downloadkernel-qcow2-linux-9d26d60f99855056a20ac7c0b68eb5ed04619831.tar.gz
kernel-qcow2-linux-9d26d60f99855056a20ac7c0b68eb5ed04619831.tar.xz
kernel-qcow2-linux-9d26d60f99855056a20ac7c0b68eb5ed04619831.zip
Staging: vt665x: Clean up include files, Part 1
Remove cplusplus lines from include files Remove needless ifdefs on includes to conform with C conventions. Remove misc commented code/includes Update TODO Signed-off-by: Jim Lieb <lieb@canonical.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/vt6656/tkip.h')
-rw-r--r--drivers/staging/vt6656/tkip.h16
1 files changed, 0 insertions, 16 deletions
diff --git a/drivers/staging/vt6656/tkip.h b/drivers/staging/vt6656/tkip.h
index dc8382b67019..847ecdf97ee8 100644
--- a/drivers/staging/vt6656/tkip.h
+++ b/drivers/staging/vt6656/tkip.h
@@ -27,19 +27,11 @@
*
*/
-
#ifndef __TKIP_H__
#define __TKIP_H__
-#if !defined(__TTYPE_H__)
#include "ttype.h"
-#endif
-
-#if !defined(__TETHER_H__)
#include "tether.h"
-#endif
-
-
/*--------------------- Export Definitions -------------------------*/
#define TKIP_KEY_LEN 16
@@ -53,9 +45,6 @@
/*--------------------- Export Variables --------------------------*/
/*--------------------- Export Functions --------------------------*/
-#ifdef __cplusplus
-extern "C" { /* Assume C declarations for C++ */
-#endif /* __cplusplus */
VOID TKIPvMixKey(
PBYTE pbyTKey,
@@ -65,11 +54,6 @@ VOID TKIPvMixKey(
PBYTE pbyRC4Key
);
-#ifdef __cplusplus
-} /* End of extern "C" { */
-#endif /* __cplusplus */
-
-
#endif // __TKIP_H__