Staging: wlan-ng: Remove use of __WLAN_ATTRIB_PACK__

Replace all ocurrances of the __WLAN_ATTRIB_PACK__ from wlan_compat.h
by __attribute__((packed)) and remove it afterwards.

Signed-off-by: Moritz Muehlenhoff <jmm@debian.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 17 insertions, 17 deletions

diff --git a/drivers/staging/wlan-ng/p80211types.h b/drivers/staging/wlan-ng/p80211types.h
index 5be6737..122e74b 100644
--- a/drivers/staging/wlan-ng/p80211types.h
+++ b/drivers/staging/wlan-ng/p80211types.h
@@ -395,48 +395,48 @@ typedef struct p80211enum
 typedef struct p80211pstr
 {
 	u8		len;
-} __WLAN_ATTRIB_PACK__ p80211pstr_t;
+} __attribute__((packed)) p80211pstr_t;
 
 typedef struct p80211pstrd
 {
 	u8		len;
 	u8		data[0];
-} __WLAN_ATTRIB_PACK__ p80211pstrd_t;
+} __attribute__((packed)) p80211pstrd_t;
 
 /* Maximum pascal string */
 typedef struct p80211pstr255
 {
 	u8		len;
 	u8		data[MAXLEN_PSTR255];
-} __WLAN_ATTRIB_PACK__ p80211pstr255_t;
+} __attribute__((packed)) p80211pstr255_t;
 
 /* pascal string for macaddress and bssid */
 typedef struct p80211pstr6
 {
 	u8		len;
 	u8		data[MAXLEN_PSTR6];
-} __WLAN_ATTRIB_PACK__ p80211pstr6_t;
+} __attribute__((packed)) p80211pstr6_t;
 
 /* pascal string for channel list */
 typedef struct p80211pstr14
 {
 	u8		len;
 	u8		data[MAXLEN_PSTR14];
-} __WLAN_ATTRIB_PACK__ p80211pstr14_t;
+} __attribute__((packed)) p80211pstr14_t;
 
 /* pascal string for ssid */
 typedef struct p80211pstr32
 {
 	u8		len;
 	u8		data[MAXLEN_PSTR32];
-} __WLAN_ATTRIB_PACK__ p80211pstr32_t;
+} __attribute__((packed)) p80211pstr32_t;
 
 /* MAC address array */
 typedef struct p80211macarray
 {
 	u32		cnt;
 	u8		data[1][MAXLEN_PSTR6];
-} __WLAN_ATTRIB_PACK__ p80211macarray_t;
+} __attribute__((packed)) p80211macarray_t;
 
 /* prototype template */
 typedef struct p80211item
@@ -444,7 +444,7 @@ typedef struct p80211item
 	u32		did;
 	u16		status;
 	u16		len;
-} __WLAN_ATTRIB_PACK__ p80211item_t;
+} __attribute__((packed)) p80211item_t;
 
 /* prototype template w/ data item */
 typedef struct p80211itemd
@@ -453,7 +453,7 @@ typedef struct p80211itemd
 	u16		status;
 	u16		len;
 	u8		data[0];
-} __WLAN_ATTRIB_PACK__ p80211itemd_t;
+} __attribute__((packed)) p80211itemd_t;
 
 /* message data item for int, BOUNDEDINT, ENUMINT */
 typedef struct p80211item_uint32
@@ -462,7 +462,7 @@ typedef struct p80211item_uint32
 	u16		status;
 	u16		len;
 	u32		data;
-} __WLAN_ATTRIB_PACK__ p80211item_uint32_t;
+} __attribute__((packed)) p80211item_uint32_t;
 
 /* message data item for OCTETSTR, DISPLAYSTR */
 typedef struct p80211item_pstr6
@@ -471,7 +471,7 @@ typedef struct p80211item_pstr6
 	u16		status;
 	u16		len;
 	p80211pstr6_t	data;
-} __WLAN_ATTRIB_PACK__ p80211item_pstr6_t;
+} __attribute__((packed)) p80211item_pstr6_t;
 
 /* message data item for OCTETSTR, DISPLAYSTR */
 typedef struct p80211item_pstr14
@@ -480,7 +480,7 @@ typedef struct p80211item_pstr14
 	u16			status;
 	u16			len;
 	p80211pstr14_t		data;
-} __WLAN_ATTRIB_PACK__ p80211item_pstr14_t;
+} __attribute__((packed)) p80211item_pstr14_t;
 
 /* message data item for OCTETSTR, DISPLAYSTR */
 typedef struct p80211item_pstr32
@@ -489,7 +489,7 @@ typedef struct p80211item_pstr32
 	u16			status;
 	u16			len;
 	p80211pstr32_t		data;
-} __WLAN_ATTRIB_PACK__ p80211item_pstr32_t;
+} __attribute__((packed)) p80211item_pstr32_t;
 
 /* message data item for OCTETSTR, DISPLAYSTR */
 typedef struct p80211item_pstr255
@@ -498,7 +498,7 @@ typedef struct p80211item_pstr255
 	u16			status;
 	u16			len;
 	p80211pstr255_t		data;
-} __WLAN_ATTRIB_PACK__ p80211item_pstr255_t;
+} __attribute__((packed)) p80211item_pstr255_t;
 
 /* message data item for UNK 392, namely mib items */
 typedef struct  p80211item_unk392
@@ -507,7 +507,7 @@ typedef struct  p80211item_unk392
 	u16		status;
 	u16		len;
 	u8		data[MAXLEN_MIBATTRIBUTE];
-} __WLAN_ATTRIB_PACK__ p80211item_unk392_t;
+} __attribute__((packed)) p80211item_unk392_t;
 
 /* message data item for UNK 1025, namely p2 pdas */
 typedef struct  p80211item_unk1024
@@ -516,7 +516,7 @@ typedef struct  p80211item_unk1024
 	u16		status;
 	u16		len;
 	u8		data[1024];
-}  __WLAN_ATTRIB_PACK__ p80211item_unk1024_t;
+}  __attribute__((packed)) p80211item_unk1024_t;
 
 /* message data item for UNK 4096, namely p2 download chunks */
 typedef struct  p80211item_unk4096
@@ -525,7 +525,7 @@ typedef struct  p80211item_unk4096
 	u16		status;
 	u16		len;
 	u8		data[4096];
-}  __WLAN_ATTRIB_PACK__ p80211item_unk4096_t;
+}  __attribute__((packed)) p80211item_unk4096_t;
 
 struct catlistitem;