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

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

diff --git a/drivers/staging/wlan-ng/p80211ioctl.h b/drivers/staging/wlan-ng/p80211ioctl.h
index ad67b698fa43c798bc8dba48ecad20770759d7ce..64ca7f95262caa58bb5287bd8c4125f298ca7567 100644 (file)
--- a/drivers/staging/wlan-ng/p80211ioctl.h
+++ b/drivers/staging/wlan-ng/p80211ioctl.h
@@ -60,14 +60,9 @@
 * --------------------------------------------------------------------
 */
 
-
 #ifndef _P80211IOCTL_H
 #define _P80211IOCTL_H
 
-/*================================================================*/
-/* Constants */
-
-/*----------------------------------------------------------------*/
 /* p80211 ioctl "request" codes.  See argument 2 of ioctl(2). */
 
 #define P80211_IFTEST          (SIOCDEVPRIVATE + 0)
@@ -78,46 +73,17 @@
 
 #define P80211_IOCTL_MAGIC     (0x4a2d464dUL)
 
-/*----------------------------------------------------------------*/
-/* Netlink protocol numbers for the indication interface */
-
-#define P80211_NL_SOCK_IND     NETLINK_USERSOCK
-
-/*----------------------------------------------------------------*/
-/* Netlink multicast bits for different types of messages */
-
-#define P80211_NL_MCAST_GRP_MLME       BIT0    /* Local station messages */
-#define P80211_NL_MCAST_GRP_SNIFF      BIT1    /* Sniffer messages */
-#define P80211_NL_MCAST_GRP_DIST       BIT2    /* Distribution system messages */
-
-/*================================================================*/
-/* Macros */
-
-
-/*================================================================*/
-/* Types */
-
 /*----------------------------------------------------------------*/
 /* A ptr to the following structure type is passed as the third */
 /*  argument to the ioctl system call when issuing a request to */
 /*  the p80211 module. */
 
-typedef struct p80211ioctl_req
-{
-       char    name[WLAN_DEVNAMELEN_MAX];
+typedef struct p80211ioctl_req {
+       char name[WLAN_DEVNAMELEN_MAX];
        caddr_t data;
-       u32     magic;
-       u16     len;
-       u32     result;
-} __WLAN_ATTRIB_PACK__ p80211ioctl_req_t;
-
-
-/*================================================================*/
-/* Extern Declarations */
-
-
-/*================================================================*/
-/* Function Declarations */
-
+       u32 magic;
+       u16 len;
+       u32 result;
+} __attribute__ ((packed)) p80211ioctl_req_t;
 
 #endif /* _P80211IOCTL_H */