aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/via-velocity.h
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/via-velocity.h
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/via-velocity.h')
-rw-r--r--drivers/net/via-velocity.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/via-velocity.h b/drivers/net/via-velocity.h
index c38191179fae..f7b33ae7a703 100644
--- a/drivers/net/via-velocity.h
+++ b/drivers/net/via-velocity.h
@@ -193,7 +193,7 @@ struct rx_desc {
193 __le32 pa_low; /* Low 32 bit PCI address */ 193 __le32 pa_low; /* Low 32 bit PCI address */
194 __le16 pa_high; /* Next 16 bit PCI address (48 total) */ 194 __le16 pa_high; /* Next 16 bit PCI address (48 total) */
195 __le16 size; /* bits 0--14 - frame size, bit 15 - enable int. */ 195 __le16 size; /* bits 0--14 - frame size, bit 15 - enable int. */
196} __attribute__ ((__packed__)); 196} __packed;
197 197
198/* 198/*
199 * Transmit descriptor 199 * Transmit descriptor
@@ -208,7 +208,7 @@ struct tdesc1 {
208 __le16 vlan; 208 __le16 vlan;
209 u8 TCR; 209 u8 TCR;
210 u8 cmd; /* bits 0--1 - TCPLS, bits 4--7 - CMDZ */ 210 u8 cmd; /* bits 0--1 - TCPLS, bits 4--7 - CMDZ */
211} __attribute__ ((__packed__)); 211} __packed;
212 212
213enum { 213enum {
214 TD_QUEUE = cpu_to_le16(0x8000) 214 TD_QUEUE = cpu_to_le16(0x8000)
@@ -218,7 +218,7 @@ struct td_buf {
218 __le32 pa_low; 218 __le32 pa_low;
219 __le16 pa_high; 219 __le16 pa_high;
220 __le16 size; /* bits 0--13 - size, bit 15 - queue */ 220 __le16 size; /* bits 0--13 - size, bit 15 - queue */
221} __attribute__ ((__packed__)); 221} __packed;
222 222
223struct tx_desc { 223struct tx_desc {
224 struct tdesc0 tdesc0; 224 struct tdesc0 tdesc0;
@@ -1096,7 +1096,7 @@ struct mac_regs {
1096 1096
1097 volatile __le16 PatternCRC[8]; /* 0xB0 */ 1097 volatile __le16 PatternCRC[8]; /* 0xB0 */
1098 volatile __le32 ByteMask[4][4]; /* 0xC0 */ 1098 volatile __le32 ByteMask[4][4]; /* 0xC0 */
1099} __attribute__ ((__packed__)); 1099} __packed;
1100 1100
1101 1101
1102enum hw_mib { 1102enum hw_mib {
@@ -1216,7 +1216,7 @@ struct arp_packet {
1216 u8 ar_sip[4]; 1216 u8 ar_sip[4];
1217 u8 ar_tha[ETH_ALEN]; 1217 u8 ar_tha[ETH_ALEN];
1218 u8 ar_tip[4]; 1218 u8 ar_tip[4];
1219} __attribute__ ((__packed__)); 1219} __packed;
1220 1220
1221struct _magic_packet { 1221struct _magic_packet {
1222 u8 dest_mac[6]; 1222 u8 dest_mac[6];
@@ -1224,7 +1224,7 @@ struct _magic_packet {
1224 __be16 type; 1224 __be16 type;
1225 u8 MAC[16][6]; 1225 u8 MAC[16][6];
1226 u8 password[6]; 1226 u8 password[6];
1227} __attribute__ ((__packed__)); 1227} __packed;
1228 1228
1229/* 1229/*
1230 * Store for chip context when saving and restoring status. Not 1230 * Store for chip context when saving and restoring status. Not