Merge branch 'for-next' of git://git.o-hand.com/linux-mfd

[sfrench/cifs-2.6.git] / drivers / staging / wlan-ng / p80211msg.h

diff --git a/drivers/staging/wlan-ng/p80211msg.h b/drivers/staging/wlan-ng/p80211msg.h
index c14e9fbbd687ac26e6955827588c91bc27a6897e..f15a5d921f3ceba1baceb06a91af5cba46d08702 100644 (file)
--- a/drivers/staging/wlan-ng/p80211msg.h
+++ b/drivers/staging/wlan-ng/p80211msg.h
@@ -48,55 +48,19 @@
 #ifndef _P80211MSG_H
 #define _P80211MSG_H
 
-/*================================================================*/
-/* System Includes */
-
 /*================================================================*/
 /* Project Includes */
 
-#ifndef _WLAN_COMPAT_H
-#include "wlan_compat.h"
-#endif
 
-/*================================================================*/
-/* Constants */
-
-#define MSG_BUFF_LEN           4000
 #define WLAN_DEVNAMELEN_MAX    16
 
-/*================================================================*/
-/* Macros */
-
-/*================================================================*/
-/* Types */
-
-/*--------------------------------------------------------------------*/
-/*----- Message Structure Types --------------------------------------*/
-
 /*--------------------------------------------------------------------*/
 /* Prototype msg type */
 
-typedef struct p80211msg
-{
-       UINT32  msgcode;
-       UINT32  msglen;
-       UINT8   devname[WLAN_DEVNAMELEN_MAX];
-} __WLAN_ATTRIB_PACK__ p80211msg_t;
-
-typedef struct p80211msgd
-{
-       UINT32  msgcode;
-       UINT32  msglen;
-       UINT8   devname[WLAN_DEVNAMELEN_MAX];
-       UINT8   args[0];
-} __WLAN_ATTRIB_PACK__ p80211msgd_t;
-
-/*================================================================*/
-/* Extern Declarations */
-
-
-/*================================================================*/
-/* Function Declarations */
-
-#endif  /* _P80211MSG_H */
+typedef struct p80211msg {
+       u32 msgcode;
+       u32 msglen;
+       u8 devname[WLAN_DEVNAMELEN_MAX];
+} __attribute__ ((packed)) p80211msg_t;
 
+#endif /* _P80211MSG_H */