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>

8 files changed, 26 insertions, 26 deletions

diff --git a/drivers/net/wireless/orinoco/fw.c b/drivers/net/wireless/orinoco/fw.c
index 3e1947d097ca..259d75853984 100644
--- a/drivers/net/wireless/orinoco/fw.c
+++ b/drivers/net/wireless/orinoco/fw.c
@@ -49,7 +49,7 @@ struct orinoco_fw_header {
         __le32 pri_offset;      /* Offset to primary plug data */
         __le32 compat_offset;   /* Offset to compatibility data*/
         char signature[0];      /* FW signature length headersize-20 */
-} __attribute__ ((packed));
+} __packed;
 
 /* Check the range of various header entries. Return a pointer to a
  * description of the problem, or NULL if everything checks out. */
diff --git a/drivers/net/wireless/orinoco/hermes.h b/drivers/net/wireless/orinoco/hermes.h
index 9ca34e722b45..d9f18c11682a 100644
--- a/drivers/net/wireless/orinoco/hermes.h
+++ b/drivers/net/wireless/orinoco/hermes.h
@@ -205,7 +205,7 @@ struct hermes_tx_descriptor {
         u8 retry_count;
         u8 tx_rate;
         __le16 tx_control;
-} __attribute__ ((packed));
+} __packed;
 
 #define HERMES_TXSTAT_RETRYERR          (0x0001)
 #define HERMES_TXSTAT_AGEDERR           (0x0002)
@@ -254,7 +254,7 @@ struct hermes_tallies_frame {
         /* Those last are probably not available in very old firmwares */
         __le16 RxDiscards_WEPICVError;
         __le16 RxDiscards_WEPExcluded;
-} __attribute__ ((packed));
+} __packed;
 
 /* Grabbed from wlan-ng - Thanks Mark... - Jean II
  * This is the result of a scan inquiry command */
@@ -271,7 +271,7 @@ struct prism2_scan_apinfo {
         u8 rates[10];           /* Bit rate supported */
         __le16 proberesp_rate;  /* Data rate of the response frame */
         __le16 atim;            /* ATIM window time, Kus (hostscan only) */
-} __attribute__ ((packed));
+} __packed;
 
 /* Same stuff for the Lucent/Agere card.
  * Thanks to h1kari <h1kari AT dachb0den.com> - Jean II */
@@ -285,7 +285,7 @@ struct agere_scan_apinfo {
         /* bits: 0-ess, 1-ibss, 4-privacy [wep] */
         __le16 essid_len;       /* ESSID length */
         u8 essid[32];           /* ESSID of the network */
-} __attribute__ ((packed));
+} __packed;
 
 /* Moustafa: Scan structure for Symbol cards */
 struct symbol_scan_apinfo {
@@ -303,7 +303,7 @@ struct symbol_scan_apinfo {
         __le16 basic_rates;     /* Basic rates bitmask */
         u8 unknown2[6];         /* Always FF:FF:FF:FF:00:00 */
         u8 unknown3[8];         /* Always 0, appeared in f/w 3.91-68 */
-} __attribute__ ((packed));
+} __packed;
 
 union hermes_scan_info {
         struct agere_scan_apinfo        a;
@@ -343,7 +343,7 @@ struct agere_ext_scan_info {
         __le16  beacon_interval;
         __le16  capabilities;
         u8      data[0];
-} __attribute__ ((packed));
+} __packed;
 
 #define HERMES_LINKSTATUS_NOT_CONNECTED   (0x0000)
 #define HERMES_LINKSTATUS_CONNECTED       (0x0001)
@@ -355,7 +355,7 @@ struct agere_ext_scan_info {
 
 struct hermes_linkstatus {
         __le16 linkstatus;         /* Link status */
-} __attribute__ ((packed));
+} __packed;
 
 struct hermes_response {
         u16 status, resp0, resp1, resp2;
@@ -365,11 +365,11 @@ struct hermes_response {
 struct hermes_idstring {
         __le16 len;
         __le16 val[16];
-} __attribute__ ((packed));
+} __packed;
 
 struct hermes_multicast {
         u8 addr[HERMES_MAX_MULTICAST][ETH_ALEN];
-} __attribute__ ((packed));
+} __packed;
 
 /* Timeouts */
 #define HERMES_BAP_BUSY_TIMEOUT (10000) /* In iterations of ~1us */
diff --git a/drivers/net/wireless/orinoco/hermes_dld.c b/drivers/net/wireless/orinoco/hermes_dld.c
index 6da85e75fce0..55741caa2b82 100644
--- a/drivers/net/wireless/orinoco/hermes_dld.c
+++ b/drivers/net/wireless/orinoco/hermes_dld.c
@@ -65,7 +65,7 @@ struct dblock {
         __le32 addr;            /* adapter address where to write the block */
         __le16 len;             /* length of the data only, in bytes */
         char data[0];           /* data to be written */
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * Plug Data References are located in in the image after the last data
@@ -77,7 +77,7 @@ struct pdr {
         __le32 addr;            /* adapter address where to write the data */
         __le32 len;             /* expected length of the data, in bytes */
         char next[0];           /* next PDR starts here */
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * Plug Data Items are located in the EEPROM read from the adapter by
@@ -88,7 +88,7 @@ struct pdi {
         __le16 len;             /* length of ID and data, in words */
         __le16 id;              /* record ID */
         char data[0];           /* plug data */
-} __attribute__ ((packed));
+} __packed;
 
 /*** FW data block access functions ***/
 
@@ -317,7 +317,7 @@ static const struct {							\
         __le16 len;                                                     \
         __le16 id;                                                      \
         u8 val[length];                                                 \
-} __attribute__ ((packed)) default_pdr_data_##pid = {                   \
+} __packed default_pdr_data_##pid = {                   \
         cpu_to_le16((sizeof(default_pdr_data_##pid)/                    \
                                 sizeof(__le16)) - 1),                   \
         cpu_to_le16(pid),                                               \
diff --git a/drivers/net/wireless/orinoco/hw.c b/drivers/net/wireless/orinoco/hw.c
index 6fbd78850123..077baa86756b 100644
--- a/drivers/net/wireless/orinoco/hw.c
+++ b/drivers/net/wireless/orinoco/hw.c
@@ -45,7 +45,7 @@ static const struct {
 /* Firmware version encoding */
 struct comp_id {
         u16 id, variant, major, minor;
-} __attribute__ ((packed));
+} __packed;
 
 static inline fwtype_t determine_firmware_type(struct comp_id *nic_id)
 {
@@ -995,7 +995,7 @@ int __orinoco_hw_set_tkip_key(struct orinoco_private *priv, int key_idx,
                 u8 tx_mic[MIC_KEYLEN];
                 u8 rx_mic[MIC_KEYLEN];
                 u8 tsc[ORINOCO_SEQ_LEN];
-        } __attribute__ ((packed)) buf;
+        } __packed buf;
         hermes_t *hw = &priv->hw;
         int ret;
         int err;
@@ -1326,7 +1326,7 @@ int orinoco_hw_disassociate(struct orinoco_private *priv,
         struct {
                 u8 addr[ETH_ALEN];
                 __le16 reason_code;
-        } __attribute__ ((packed)) buf;
+        } __packed buf;
 
         /* Currently only supported by WPA enabled Agere fw */
         if (!priv->has_wpa)
diff --git a/drivers/net/wireless/orinoco/main.c b/drivers/net/wireless/orinoco/main.c
index ca71f08709bc..e8e2d0f4763d 100644
--- a/drivers/net/wireless/orinoco/main.c
+++ b/drivers/net/wireless/orinoco/main.c
@@ -172,7 +172,7 @@ struct hermes_txexc_data {
         __le16 frame_ctl;
         __le16 duration_id;
         u8 addr1[ETH_ALEN];
-} __attribute__ ((packed));
+} __packed;
 
 /* Rx frame header except compatibility 802.3 header */
 struct hermes_rx_descriptor {
@@ -196,7 +196,7 @@ struct hermes_rx_descriptor {
 
         /* Data length */
         __le16 data_len;
-} __attribute__ ((packed));
+} __packed;
 
 struct orinoco_rx_data {
         struct hermes_rx_descriptor *desc;
@@ -390,7 +390,7 @@ int orinoco_process_xmit_skb(struct sk_buff *skb,
                 struct header_struct {
                         struct ethhdr eth;      /* 802.3 header */
                         u8 encap[6];            /* 802.2 header */
-                } __attribute__ ((packed)) hdr;
+                } __packed hdr;
                 int len = skb->len + sizeof(encaps_hdr) - (2 * ETH_ALEN);
 
                 if (skb_headroom(skb) < ENCAPS_OVERHEAD) {
@@ -1170,7 +1170,7 @@ static void orinoco_join_ap(struct work_struct *work)
         struct join_req {
                 u8 bssid[ETH_ALEN];
                 __le16 channel;
-        } __attribute__ ((packed)) req;
+        } __packed req;
         const int atom_len = offsetof(struct prism2_scan_apinfo, atim);
         struct prism2_scan_apinfo *atom = NULL;
         int offset = 4;
@@ -1410,7 +1410,7 @@ void __orinoco_ev_info(struct net_device *dev, hermes_t *hw)
         struct {
                 __le16 len;
                 __le16 type;
-        } __attribute__ ((packed)) info;
+        } __packed info;
         int len, type;
         int err;
 
diff --git a/drivers/net/wireless/orinoco/orinoco.h b/drivers/net/wireless/orinoco/orinoco.h
index a6da86e0a70f..255710ef082a 100644
--- a/drivers/net/wireless/orinoco/orinoco.h
+++ b/drivers/net/wireless/orinoco/orinoco.h
@@ -32,7 +32,7 @@
 struct orinoco_key {
         __le16 len;     /* always stored as little-endian */
         char data[ORINOCO_MAX_KEY_SIZE];
-} __attribute__ ((packed));
+} __packed;
 
 #define TKIP_KEYLEN     16
 #define MIC_KEYLEN      8
diff --git a/drivers/net/wireless/orinoco/orinoco_usb.c b/drivers/net/wireless/orinoco/orinoco_usb.c
index 78f089baa8c9..11536ef17ba3 100644
--- a/drivers/net/wireless/orinoco/orinoco_usb.c
+++ b/drivers/net/wireless/orinoco/orinoco_usb.c
@@ -90,7 +90,7 @@ struct header_struct {
         /* SNAP */
         u8 oui[3];
         __be16 ethertype;
-} __attribute__ ((packed));
+} __packed;
 
 struct ez_usb_fw {
         u16 size;
@@ -222,7 +222,7 @@ struct ezusb_packet {
         __le16 hermes_len;
         __le16 hermes_rid;
         u8 data[0];
-} __attribute__ ((packed));
+} __packed;
 
 /* Table of devices that work or may work with this driver */
 static struct usb_device_id ezusb_table[] = {
diff --git a/drivers/net/wireless/orinoco/wext.c b/drivers/net/wireless/orinoco/wext.c
index 5775124e2aee..9f86a272cb78 100644
--- a/drivers/net/wireless/orinoco/wext.c
+++ b/drivers/net/wireless/orinoco/wext.c
@@ -128,7 +128,7 @@ static struct iw_statistics *orinoco_get_wireless_stats(struct net_device *dev)
         } else {
                 struct {
                         __le16 qual, signal, noise, unused;
-                } __attribute__ ((packed)) cq;
+                } __packed cq;
 
                 err = HERMES_READ_RECORD(hw, USER_BAP,
                                          HERMES_RID_COMMSQUALITY, &cq);