Subject: [PATCH 4/6] rt2x00 update: Remove packed attributes for structures that don't need it

From: Ivo van Doorn <[email-masked]>
Date: Fri, 28 Apr 2006 16:52:28 +0200

From: Ivo van Doorn <[email-masked]>

Remove __attribute__ ((packed)) for structures that
are not being send to the device.

Signed-off-by: Ivo van Doorn <[email-masked]>

diff -uprN wireless-dev-rt2x00/drivers/net/wireless/d80211/rt2x00/rt2x00.h wireless-dev-rt2x00-patch/drivers/net/wireless/d80211/rt2x00/rt2x00.h
--- wireless-dev-rt2x00/drivers/net/wireless/d80211/rt2x00/rt2x00.h	2006-04-28 15:09:53.000000000 +0200
+++ wireless-dev-rt2x00-patch/drivers/net/wireless/d80211/rt2x00/rt2x00.h	2006-04-28 15:50:06.000000000 +0200
@@ -324,12 +324,12 @@ extern int error_bitrange_bad;
 struct rt2x00_field16{
 	u16	bit_offset;
 	u16	bit_mask;
-} __attribute__ ((packed));
+};
 
 struct rt2x00_field32{
 	u32	bit_offset;
 	u32	bit_mask;
-} __attribute__ ((packed));
+};
 
 /*
  * Before intitializing the rt2x00_field# structures,
@@ -430,7 +430,7 @@ rt2x00_get_field16_nb(const u16 reg, con
 struct _rt2x00_chip{
 	u16				rt;
 	u16				rf;
-} __attribute__ ((packed));
+};
 
 /*
  * Set chipset data.
@@ -511,7 +511,7 @@ struct data_ring{
 	 */
 	u16					data_size;
 	u16					desc_size;
-} __attribute__ ((packed));
+};
 
 /*
  * Handlers to determine the address of the current device specific
@@ -612,7 +612,7 @@ struct scanning{
 	short					status;
 #define SCANNING_READY				0x0001
 #define SCANNING_CANCELLED			0x0002
-} __attribute__ ((packed));
+};

 /*
diff -uprN wireless-dev-rt2x00/drivers/net/wireless/d80211/rt2x00/rt2x00pci.h wireless-dev-rt2x00-patch/drivers/net/wireless/d80211/rt2x00/rt2x00pci.h
--- wireless-dev-rt2x00/drivers/net/wireless/d80211/rt2x00/rt2x00pci.h	2006-04-28 15:09:45.000000000 +0200
+++ wireless-dev-rt2x00-patch/drivers/net/wireless/d80211/rt2x00/rt2x00pci.h	2006-04-28 15:49:18.000000000 +0200
@@ -72,7 +72,7 @@ struct rt2x00_button{
 	short					button_status:1;
 	short					active_poll:1;
 	short					__pad:14;
-} __attribute__ ((packed));
+};
 #endif /* CONFIG_RT2X00_BUTTON */
 
 /*
@@ -106,7 +106,7 @@ struct data_entry{
 	 */
 	void				*data_addr;
 	dma_addr_t			data_dma;
-} __attribute__ ((packed));
+};
 
 /*
  * Device specific structure.
@@ -231,7 +231,7 @@ struct rt2x00_pci{
 	 * after that the beacon and RX ring follow.
 	 */
 	struct data_ring			*ring;
-} __attribute__ ((packed));
+};
 
 static inline struct data_ring*
 rt2x00pci_get_ring(struct rt2x00_pci *rt2x00pci, const int ring)
diff -uprN wireless-dev-rt2x00/drivers/net/wireless/d80211/rt2x00/rt2x00usb.h wireless-dev-rt2x00-patch/drivers/net/wireless/d80211/rt2x00/rt2x00usb.h
--- wireless-dev-rt2x00/drivers/net/wireless/d80211/rt2x00/rt2x00usb.h	2006-04-28 15:09:44.000000000 +0200
+++ wireless-dev-rt2x00-patch/drivers/net/wireless/d80211/rt2x00/rt2x00usb.h	2006-04-28 15:49:31.000000000 +0200
@@ -85,7 +85,7 @@ struct data_entry{
 	 */
 	void				*data_addr;
 	dma_addr_t			data_dma;
-} __attribute__ ((packed));
+};
 
 /*
  * The location of the descriptor is variating and depends
@@ -215,7 +215,7 @@ struct rt2x00_usb{
 	 * after that the beacon and RX ring follow.
 	 */
 	struct data_ring			*ring;
-} __attribute__ ((packed));
+};
 
 static inline struct data_ring*
 rt2x00usb_get_ring(struct rt2x00_usb *rt2x00usb, const int ring)