lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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: Pekka Enberg <penberg@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Pekka Enberg
2010-09-19 12:28:41 +03:00
committed by Greg Kroah-Hartman
parent f2e497e3e9
commit 3c093865ae
2 changed files with 34 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
drivers/staging/winbond/core.h
View File

@@ -1,12 +1,45 @@
#ifndef __WINBOND_CORE_H #ifndef __WINBOND_CORE_H
#define __WINBOND_CORE_H #define __WINBOND_CORE_H
#include <linux/spinlock.h>
#include <linux/wireless.h> #include <linux/wireless.h>
#include <linux/types.h>
#include "mlme_s.h"
#include "wbhal_s.h" #include "wbhal_s.h"
#include "mto.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 WBLINUX_PACKET_ARRAY_SIZE (ETHERNET_TX_DESCRIPTORS*4)
#define WB_MAX_LINK_NAME_LEN 40 #define WB_MAX_LINK_NAME_LEN 40

44
drivers/staging/winbond/mlme_s.h
View File

@@ -1,44 +0,0 @@
#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