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

Commit 3c093865 authored by Pekka Enberg's avatar Pekka Enberg Committed by Greg Kroah-Hartman
Browse files

staging: w35und: Inline mlme_s.h to core.h 



The mlme_s.h header is included in one place. As the header is very small, just
inline it to core.h.

Cc: Lars Lindley <lindley@coyote.org>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Ruslan Pisarev <ruslan@rpisarev.org.ua>
Signed-off-by: default avatarPekka Enberg <penberg@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent f2e497e3

drivers/staging/winbond/core.h

+34 −1
Original line number Diff line number Diff line 
#ifndef __WINBOND_CORE_H

#define __WINBOND_CORE_H



#include <linux/spinlock.h>

#include <linux/wireless.h>

#include <linux/types.h>



#include "mlme_s.h"

#include "wbhal_s.h"

#include "mto.h"



#include "mac_structures.h"

#include "mds_s.h"



#define MAX_NUM_TX_MMPDU		2

#define MAX_MMPDU_SIZE			1512

#define MAX_NUM_RX_MMPDU		6



struct mlme_frame {

	s8		*pMMPDU;

	u16		len;

	u8		DataType;

	u8		IsInUsed;



	spinlock_t	MLMESpinLock;



	u8		TxMMPDU[MAX_NUM_TX_MMPDU][MAX_MMPDU_SIZE];

	u8		TxMMPDUInUse[(MAX_NUM_TX_MMPDU + 3) & ~0x03];



	u16		wNumTxMMPDU;

	u16		wNumTxMMPDUDiscarded;



	u8		RxMMPDU[MAX_NUM_RX_MMPDU][MAX_MMPDU_SIZE];

	u8		SaveRxBufSlotInUse[(MAX_NUM_RX_MMPDU + 3) & ~0x03];



	u16		wNumRxMMPDU;

	u16		wNumRxMMPDUDiscarded;



	u16		wNumRxMMPDUInMLME;	/* Number of the Rx MMPDU */

	u16		reserved_1;		/*  in MLME. */

						/*  excluding the discarded */

};



#define WBLINUX_PACKET_ARRAY_SIZE (ETHERNET_TX_DESCRIPTORS*4)



#define WB_MAX_LINK_NAME_LEN 40

drivers/staging/winbond/mlme_s.h

deleted100644 → 0
+0 −44
Original line number Diff line number Diff line 
#ifndef __WINBOND_MLME_H

#define __WINBOND_MLME_H



#include <linux/types.h>

#include <linux/spinlock.h>



#include "mac_structures.h"

#include "mds_s.h"



/*

 * ==============================================

 * Global data structures

 * ==============================================

 */

#define MAX_NUM_TX_MMPDU		2

#define MAX_MMPDU_SIZE			1512

#define MAX_NUM_RX_MMPDU		6



struct mlme_frame {

	s8		*pMMPDU;

	u16		len;

	u8		DataType;

	u8		IsInUsed;



	spinlock_t	MLMESpinLock;



	u8		TxMMPDU[MAX_NUM_TX_MMPDU][MAX_MMPDU_SIZE];

	u8		TxMMPDUInUse[(MAX_NUM_TX_MMPDU + 3) & ~0x03];



	u16		wNumTxMMPDU;

	u16		wNumTxMMPDUDiscarded;



	u8		RxMMPDU[MAX_NUM_RX_MMPDU][MAX_MMPDU_SIZE];

	u8		SaveRxBufSlotInUse[(MAX_NUM_RX_MMPDU + 3) & ~0x03];



	u16		wNumRxMMPDU;

	u16		wNumRxMMPDUDiscarded;



	u16		wNumRxMMPDUInMLME;	/* Number of the Rx MMPDU */

	u16		reserved_1;		/*  in MLME. */

						/*  excluding the discarded */

};



#endif