Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 80aba536 authored by Pekka Enberg's avatar Pekka Enberg Committed by Greg Kroah-Hartman
Browse files

Staging: w35und: #include cleanup 



This patch moves #includes from sysdef.h and common.h to the files which
actually need them. This makes the dependencies less complex and allows us to
move code around much easily.

Acked-by: default avatarPavel Machek <pavel@suse.cz>
Signed-off-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
parent 8971280f

drivers/staging/winbond/adapter.h

+11 −0
Original line number Diff line number Diff line 
#ifndef __WINBOND_ADAPTER_H

#define __WINBOND_ADAPTER_H



#include <linux/wireless.h>



#include "bssdscpt.h"

#include "mto.h"

#include "wbhal_s.h"



#define OS_SET_SHUTDOWN( _A )		_A->shutdown=1

#define OS_SET_RESUME( _A )		_A->shutdown=0

#define OS_STOP( _A )	WBLINUX_stop( _A )
@@ -45,3 +54,5 @@ struct wb35_adapter { 


	u8 LinkName[MAX_ANSI_STRING];

};



#endif

drivers/staging/winbond/bss_f.h

+8 −4
Original line number Diff line number Diff line 
#ifndef __WINBOND_BSS_F_H

#define __WINBOND_BSS_F_H



#include "adapter.h"



struct PMKID_Information_Element;



//

// BSS descriptor DataBase management global function

//
@@ -53,7 +60,4 @@ u16 SearchPmkid(struct wb35_adapter * adapter, struct Management_Frame* msgHead 
				   struct PMKID_Information_Element * AssoReq_PMKID );

#endif









#endif

drivers/staging/winbond/bssdscpt.h

+9 −1
Original line number Diff line number Diff line 
#ifndef __WINBOND_BSSDSCPT_H

#define __WINBOND_BSSDSCPT_H



#include <linux/types.h>



#include "mds_s.h"

#include "mlme_s.h"



//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

//	bssdscpt.c

//		BSS descriptor data base
@@ -153,4 +161,4 @@ typedef struct BSSDescriptionElement 


#define psBSS(i)			(&(adapter->asBSSDescriptElement[(i)]))



#endif

drivers/staging/winbond/ds_tkip.h

+6 −2
Original line number Diff line number Diff line 
#ifndef __WINBOND_DS_TKIP_H

#define __WINBOND_DS_TKIP_H



#include <linux/types.h>



// Rotation functions on 32 bit values

#define ROL32( A, n ) \

    ( ((A) << (n)) | ( ((A)>>(32-(n)))  & ( (1UL << (n)) - 1 ) ) )
@@ -29,5 +34,4 @@ typedef struct tkip 
void Mds_MicGet(  void* adapter,  void* pRxLayer1,  u8 *pKey,  u8 *pMic );

void Mds_MicFill(  void* adapter,  void* pDes,  u8 *XmitBufAddress );





#endif

drivers/staging/winbond/gl_80211.h

+2 −1
Original line number Diff line number Diff line 


#ifndef __GL_80211_H__

#define __GL_80211_H__



#include <linux/types.h>



/****************** CONSTANT AND MACRO SECTION ******************************/



/* BSS Type */