diff options
author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-06-02 14:10:09 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-06-03 06:18:23 -0400 |
commit | ba2d3587912f82d1ab4367975b1df460db60fb1e (patch) | |
tree | 1e4e04caf23274bb4e39edbfc5713b4856326953 /drivers/net/irda | |
parent | 1273d97674a1782ff55b823aa6c40aea9b538aaf (diff) |
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>
Diffstat (limited to 'drivers/net/irda')
-rw-r--r-- | drivers/net/irda/donauboe.h | 2 | ||||
-rw-r--r-- | drivers/net/irda/irda-usb.h | 2 | ||||
-rw-r--r-- | drivers/net/irda/ks959-sir.c | 2 | ||||
-rw-r--r-- | drivers/net/irda/ksdazzle-sir.c | 2 | ||||
-rw-r--r-- | drivers/net/irda/vlsi_ir.h | 6 |
5 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/irda/donauboe.h b/drivers/net/irda/donauboe.h index 0dbd1932b72f..36c3060411d2 100644 --- a/drivers/net/irda/donauboe.h +++ b/drivers/net/irda/donauboe.h | |||
@@ -273,7 +273,7 @@ struct OboeSlot | |||
273 | __u8 control; /*Slot control/status see below */ | 273 | __u8 control; /*Slot control/status see below */ |
274 | __u32 address; /*Slot buffer address */ | 274 | __u32 address; /*Slot buffer address */ |
275 | } | 275 | } |
276 | __attribute__ ((packed)); | 276 | __packed; |
277 | 277 | ||
278 | #define OBOE_NTASKS OBOE_TXRING_OFFSET_IN_SLOTS | 278 | #define OBOE_NTASKS OBOE_TXRING_OFFSET_IN_SLOTS |
279 | 279 | ||
diff --git a/drivers/net/irda/irda-usb.h b/drivers/net/irda/irda-usb.h index ac0443d52e50..58ddb5214916 100644 --- a/drivers/net/irda/irda-usb.h +++ b/drivers/net/irda/irda-usb.h | |||
@@ -125,7 +125,7 @@ struct irda_class_desc { | |||
125 | __u8 bmAdditionalBOFs; | 125 | __u8 bmAdditionalBOFs; |
126 | __u8 bIrdaRateSniff; | 126 | __u8 bIrdaRateSniff; |
127 | __u8 bMaxUnicastList; | 127 | __u8 bMaxUnicastList; |
128 | } __attribute__ ((packed)); | 128 | } __packed; |
129 | 129 | ||
130 | /* class specific interface request to get the IrDA-USB class descriptor | 130 | /* class specific interface request to get the IrDA-USB class descriptor |
131 | * (6.2.5, USB-IrDA class spec 1.0) */ | 131 | * (6.2.5, USB-IrDA class spec 1.0) */ |
diff --git a/drivers/net/irda/ks959-sir.c b/drivers/net/irda/ks959-sir.c index b54d3b48045e..1046014dd6c2 100644 --- a/drivers/net/irda/ks959-sir.c +++ b/drivers/net/irda/ks959-sir.c | |||
@@ -154,7 +154,7 @@ struct ks959_speedparams { | |||
154 | __le32 baudrate; /* baud rate, little endian */ | 154 | __le32 baudrate; /* baud rate, little endian */ |
155 | __u8 flags; | 155 | __u8 flags; |
156 | __u8 reserved[3]; | 156 | __u8 reserved[3]; |
157 | } __attribute__ ((packed)); | 157 | } __packed; |
158 | 158 | ||
159 | #define KS_DATA_5_BITS 0x00 | 159 | #define KS_DATA_5_BITS 0x00 |
160 | #define KS_DATA_6_BITS 0x01 | 160 | #define KS_DATA_6_BITS 0x01 |
diff --git a/drivers/net/irda/ksdazzle-sir.c b/drivers/net/irda/ksdazzle-sir.c index 8d713ebac15b..9cc142fcc712 100644 --- a/drivers/net/irda/ksdazzle-sir.c +++ b/drivers/net/irda/ksdazzle-sir.c | |||
@@ -117,7 +117,7 @@ struct ksdazzle_speedparams { | |||
117 | __le32 baudrate; /* baud rate, little endian */ | 117 | __le32 baudrate; /* baud rate, little endian */ |
118 | __u8 flags; | 118 | __u8 flags; |
119 | __u8 reserved[3]; | 119 | __u8 reserved[3]; |
120 | } __attribute__ ((packed)); | 120 | } __packed; |
121 | 121 | ||
122 | #define KS_DATA_5_BITS 0x00 | 122 | #define KS_DATA_5_BITS 0x00 |
123 | #define KS_DATA_6_BITS 0x01 | 123 | #define KS_DATA_6_BITS 0x01 |
diff --git a/drivers/net/irda/vlsi_ir.h b/drivers/net/irda/vlsi_ir.h index 3050d1a0cccf..3f24a1f33022 100644 --- a/drivers/net/irda/vlsi_ir.h +++ b/drivers/net/irda/vlsi_ir.h | |||
@@ -544,9 +544,9 @@ struct ring_descr_hw { | |||
544 | struct { | 544 | struct { |
545 | u8 addr_res[3]; | 545 | u8 addr_res[3]; |
546 | volatile u8 status; /* descriptor status */ | 546 | volatile u8 status; /* descriptor status */ |
547 | } __attribute__((packed)) rd_s; | 547 | } __packed rd_s; |
548 | } __attribute((packed)) rd_u; | 548 | } __packed rd_u; |
549 | } __attribute__ ((packed)); | 549 | } __packed; |
550 | 550 | ||
551 | #define rd_addr rd_u.addr | 551 | #define rd_addr rd_u.addr |
552 | #define rd_status rd_u.rd_s.status | 552 | #define rd_status rd_u.rd_s.status |