aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/can
diff options
context:
space:
mode:
authorEric Dumazet <eric.dumazet@gmail.com>2010-06-02 14:10:09 -0400
committerDavid S. Miller <davem@davemloft.net>2010-06-03 06:18:23 -0400
commitba2d3587912f82d1ab4367975b1df460db60fb1e (patch)
tree1e4e04caf23274bb4e39edbfc5713b4856326953 /drivers/net/can
parent1273d97674a1782ff55b823aa6c40aea9b538aaf (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/can')
-rw-r--r--drivers/net/can/mscan/mscan.h2
-rw-r--r--drivers/net/can/usb/ems_usb.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/can/mscan/mscan.h b/drivers/net/can/mscan/mscan.h
index 4ff966473bc9..b43e9f5d3268 100644
--- a/drivers/net/can/mscan/mscan.h
+++ b/drivers/net/can/mscan/mscan.h
@@ -227,7 +227,7 @@ struct mscan_regs {
227 u16 time; /* + 0x7c 0x3e */ 227 u16 time; /* + 0x7c 0x3e */
228 } tx; 228 } tx;
229 _MSCAN_RESERVED_(32, 2); /* + 0x7e */ 229 _MSCAN_RESERVED_(32, 2); /* + 0x7e */
230} __attribute__ ((packed)); 230} __packed;
231 231
232#undef _MSCAN_RESERVED_ 232#undef _MSCAN_RESERVED_
233#define MSCAN_REGION sizeof(struct mscan) 233#define MSCAN_REGION sizeof(struct mscan)
diff --git a/drivers/net/can/usb/ems_usb.c b/drivers/net/can/usb/ems_usb.c
index 1fc0871d2ef7..e75f1a876972 100644
--- a/drivers/net/can/usb/ems_usb.c
+++ b/drivers/net/can/usb/ems_usb.c
@@ -197,7 +197,7 @@ struct cpc_can_err_counter {
197}; 197};
198 198
199/* Main message type used between library and application */ 199/* Main message type used between library and application */
200struct __attribute__ ((packed)) ems_cpc_msg { 200struct __packed ems_cpc_msg {
201 u8 type; /* type of message */ 201 u8 type; /* type of message */
202 u8 length; /* length of data within union 'msg' */ 202 u8 length; /* length of data within union 'msg' */
203 u8 msgid; /* confirmation handle */ 203 u8 msgid; /* confirmation handle */