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>

diff --git a/drivers/staging/winbond/core.h b/drivers/staging/winbond/core.h
index 2e9f02ad9e80fe020740a3782d89917e2d807b4c..294d371e60d284e582014d83c7bdbf65a5109308 100644 (file)
--- 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 (file)
index 0e7d2f6..0000000
--- 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