drivers/net: use __packed annotation

cleanup patch.

Use new __packed annotation in drivers/net/

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

3 files changed, 17 insertions, 17 deletions

diff --git a/drivers/net/wireless/b43/b43.h b/drivers/net/wireless/b43/b43.h
index 3a003e6803a..8674a99356a 100644
--- a/drivers/net/wireless/b43/b43.h
+++ b/drivers/net/wireless/b43/b43.h
@@ -530,7 +530,7 @@ struct b43_fw_header {
         /* Size of the data. For ucode and PCM this is in bytes.
          * For IV this is number-of-ivs. */
         __be32 size;
-} __attribute__((__packed__));
+} __packed;
 
 /* Initial Value file format */
 #define B43_IV_OFFSET_MASK      0x7FFF
@@ -540,8 +540,8 @@ struct b43_iv {
         union {
                 __be16 d16;
                 __be32 d32;
-        } data __attribute__((__packed__));
-} __attribute__((__packed__));
+        } data __packed;
+} __packed;
 
 
 /* Data structures for DMA transmission, per 80211 core. */
diff --git a/drivers/net/wireless/b43/dma.h b/drivers/net/wireless/b43/dma.h
index dc91944d602..a01c2100f16 100644
--- a/drivers/net/wireless/b43/dma.h
+++ b/drivers/net/wireless/b43/dma.h
@@ -67,7 +67,7 @@
 struct b43_dmadesc32 {
         __le32 control;
         __le32 address;
-} __attribute__ ((__packed__));
+} __packed;
 #define B43_DMA32_DCTL_BYTECNT          0x00001FFF
 #define B43_DMA32_DCTL_ADDREXT_MASK             0x00030000
 #define B43_DMA32_DCTL_ADDREXT_SHIFT    16
@@ -140,7 +140,7 @@ struct b43_dmadesc64 {
         __le32 control1;
         __le32 address_low;
         __le32 address_high;
-} __attribute__ ((__packed__));
+} __packed;
 #define B43_DMA64_DCTL0_DTABLEEND               0x10000000
 #define B43_DMA64_DCTL0_IRQ                     0x20000000
 #define B43_DMA64_DCTL0_FRAMEEND                0x40000000
@@ -153,8 +153,8 @@ struct b43_dmadesc_generic {
         union {
                 struct b43_dmadesc32 dma32;
                 struct b43_dmadesc64 dma64;
-        } __attribute__ ((__packed__));
-} __attribute__ ((__packed__));
+        } __packed;
+} __packed;
 
 /* Misc DMA constants */
 #define B43_DMA_RINGMEMSIZE             PAGE_SIZE
diff --git a/drivers/net/wireless/b43/xmit.h b/drivers/net/wireless/b43/xmit.h
index d23ff9fe0c9..d4cf9b390af 100644
--- a/drivers/net/wireless/b43/xmit.h
+++ b/drivers/net/wireless/b43/xmit.h
@@ -10,8 +10,8 @@
                 union {                         \
                         __le32 data;            \
                         __u8 raw[size];         \
-                } __attribute__((__packed__));  \
-        } __attribute__((__packed__))
+                } __packed;     \
+        } __packed
 
 /* struct b43_plcp_hdr4 */
 _b43_declare_plcp_hdr(4);
@@ -57,7 +57,7 @@ struct b43_txhdr {
                         __u8 rts_frame[16];             /* The RTS frame (if used) */
                         PAD_BYTES(2);
                         struct b43_plcp_hdr6 plcp;      /* Main PLCP header */
-                } new_format __attribute__ ((__packed__));
+                } new_format __packed;
 
                 /* The old r351 format. */
                 struct {
@@ -68,10 +68,10 @@ struct b43_txhdr {
                         __u8 rts_frame[16];             /* The RTS frame (if used) */
                         PAD_BYTES(2);
                         struct b43_plcp_hdr6 plcp;      /* Main PLCP header */
-                } old_format __attribute__ ((__packed__));
+                } old_format __packed;
 
-        } __attribute__ ((__packed__));
-} __attribute__ ((__packed__));
+        } __packed;
+} __packed;
 
 /* MAC TX control */
 #define B43_TXH_MAC_USEFBR              0x10000000 /* Use fallback rate for this AMPDU */
@@ -218,20 +218,20 @@ struct b43_rxhdr_fw4 {
                 struct {
                         __u8 jssi;      /* PHY RX Status 1: JSSI */
                         __u8 sig_qual;  /* PHY RX Status 1: Signal Quality */
-                } __attribute__ ((__packed__));
+                } __packed;
 
                 /* RSSI for N-PHYs */
                 struct {
                         __s8 power0;    /* PHY RX Status 1: Power 0 */
                         __s8 power1;    /* PHY RX Status 1: Power 1 */
-                } __attribute__ ((__packed__));
-        } __attribute__ ((__packed__));
+                } __packed;
+        } __packed;
         __le16 phy_status2;     /* PHY RX Status 2 */
         __le16 phy_status3;     /* PHY RX Status 3 */
         __le32 mac_status;      /* MAC RX status */
         __le16 mac_time;
         __le16 channel;
-} __attribute__ ((__packed__));
+} __packed;
 
 /* PHY RX Status 0 */
 #define B43_RX_PHYST0_GAINCTL           0x4000 /* Gain Control */