diff options
| author | Pekka Enberg <penberg@kernel.org> | 2010-09-19 12:28:41 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-09-21 10:44:56 -0700 |
| commit | 3c093865aecc7addd34a56b5cf4b2ee9223d9b2d (patch) | |
| tree | ed09734ed4d9de73d10d62b95f71ccf6425506e1 /drivers/staging/winbond | |
| parent | f2e497e3e905f60f44eb475b527cc0e443ce4d0b (diff) | |
| download | talos-op-linux-3c093865aecc7addd34a56b5cf4b2ee9223d9b2d.tar.gz talos-op-linux-3c093865aecc7addd34a56b5cf4b2ee9223d9b2d.zip | |
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: Pekka Enberg <penberg@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/winbond')
| -rw-r--r-- | drivers/staging/winbond/core.h | 35 | ||||
| -rw-r--r-- | drivers/staging/winbond/mlme_s.h | 44 |
2 files changed, 34 insertions, 45 deletions
diff --git a/drivers/staging/winbond/core.h b/drivers/staging/winbond/core.h index 2e9f02ad9e80..294d371e60d2 100644 --- a/drivers/staging/winbond/core.h +++ b/drivers/staging/winbond/core.h @@ -1,12 +1,45 @@ #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 diff --git a/drivers/staging/winbond/mlme_s.h b/drivers/staging/winbond/mlme_s.h deleted file mode 100644 index 0e7d2f629aa1..000000000000 --- a/drivers/staging/winbond/mlme_s.h +++ /dev/null @@ -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 |
