Commit a7ad322a authored by Jim Lieb's avatar Jim Lieb Committed by Greg Kroah-Hartman
Browse files

Staging: vt665x: Clean up include files, Part 2 



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: default avatarJim Lieb <lieb@canonical.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 9d26d60f

drivers/staging/vt6655/80211hdr.h

+0 −5
Original line number Diff line number Diff line
@@ -28,15 +28,10 @@ 
 *

 */







#ifndef __80211HDR_H__

#define __80211HDR_H__





#if !defined(__TTYPE_H__)

#include "ttype.h"

#endif



/*---------------------  Export Definitions -------------------------*/

// bit type

drivers/staging/vt6655/80211mgr.c

+0 −16
Original line number Diff line number Diff line
@@ -52,28 +52,12 @@ 
 *

 */







#if !defined(__TMACRO_H__)

#include "tmacro.h"

#endif

#if !defined(__TETHER_H__)

#include "tether.h"

#endif

#if !defined(__80211MGR_H__)

#include "80211mgr.h"

#endif

#if !defined(__80211HDR_H__)

#include "80211hdr.h"

#endif

#if !defined(__DEVICE_H__)

#include "device.h"

#endif

#if !defined(__WPA_H__)

#include "wpa.h"

#endif







/*---------------------  Static Definitions -------------------------*/

drivers/staging/vt6655/80211mgr.h

+1 −6
Original line number Diff line number Diff line
@@ -28,17 +28,11 @@ 
 *

 */





#ifndef __80211MGR_H__

#define __80211MGR_H__



#if !defined(__TTYPE_H__)

#include "ttype.h"

#endif

#if !defined(__80211HDR_H__)

#include "80211hdr.h"

#endif





/*---------------------  Export Definitions -------------------------*/
@@ -719,6 +713,7 @@ typedef struct tagWLAN_FR_DEAUTHEN { 
} WLAN_FR_DEAUTHEN, *PWLAN_FR_DEAUTHEN;



/*---------------------  Export Functions  --------------------------*/



VOID

vMgrEncodeBeacon(

    IN  PWLAN_FR_BEACON  pFrame

drivers/staging/vt6655/IEEE11h.c

+0 −20
Original line number Diff line number Diff line
@@ -31,34 +31,14 @@ 
 *

 */





#if !defined(__TTYPE_H__)

#include "ttype.h"

#endif

#if !defined(__UMEM_H__)

#include "umem.h"

#endif

#if !defined(__TMACRO_H__)

#include "tmacro.h"

#endif

#if !defined(__TETHER_H__)

#include "tether.h"

#endif

#if !defined(__IEEE11h_H__)

#include "IEEE11h.h"

#endif



#if !defined(__DEVICE_H__)

#include "device.h"

#endif

#if !defined(__WMGR_H__)

#include "wmgr.h"

#endif

#if !defined(__RXTX_H__)

#include "rxtx.h"

#endif







/*---------------------  Static Definitions -------------------------*/

static int          msglevel                =MSG_LEVEL_INFO;

drivers/staging/vt6655/IEEE11h.h

+0 −16
Original line number Diff line number Diff line
@@ -31,17 +31,9 @@ 
#ifndef __IEEE11h_H__

#define __IEEE11h_H__





#if !defined(__TTYPE_H__)

#include "ttype.h"

#endif

#if !defined(__80211HDR_H__)

#include "80211hdr.h"

#endif

#if !defined(__80211MGR_H__)

#include "80211mgr.h"

#endif





/*---------------------  Export Definitions -------------------------*/
@@ -52,17 +44,9 @@ 
/*---------------------  Export Types  ------------------------------*/



/*---------------------  Export Functions  --------------------------*/

#ifdef __cplusplus

extern "C" {                            /* Assume C declarations for C++ */

#endif /* __cplusplus */



BOOL IEEE11hbMSRRepTx (

    IN PVOID pMgmtHandle

    );



#ifdef __cplusplus

}                                       /* End of extern "C" { */

#endif /* __cplusplus */





#endif // __IEEE11h_H__