aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/typhoon.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/typhoon.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/typhoon.h')
-rw-r--r--drivers/net/typhoon.h26
1 files changed, 13 insertions, 13 deletions
diff --git a/drivers/net/typhoon.h b/drivers/net/typhoon.h
index 673fd5125914..88187fc84aa3 100644
--- a/drivers/net/typhoon.h
+++ b/drivers/net/typhoon.h
@@ -77,7 +77,7 @@ struct typhoon_indexes {
77 volatile __le32 cmdCleared; 77 volatile __le32 cmdCleared;
78 volatile __le32 respReady; 78 volatile __le32 respReady;
79 volatile __le32 rxHiReady; 79 volatile __le32 rxHiReady;
80} __attribute__ ((packed)); 80} __packed;
81 81
82/* The host<->Typhoon interface 82/* The host<->Typhoon interface
83 * Our means of communicating where things are 83 * Our means of communicating where things are
@@ -125,7 +125,7 @@ struct typhoon_interface {
125 __le32 rxHiAddr; 125 __le32 rxHiAddr;
126 __le32 rxHiAddrHi; 126 __le32 rxHiAddrHi;
127 __le32 rxHiSize; 127 __le32 rxHiSize;
128} __attribute__ ((packed)); 128} __packed;
129 129
130/* The Typhoon transmit/fragment descriptor 130/* The Typhoon transmit/fragment descriptor
131 * 131 *
@@ -187,7 +187,7 @@ struct tx_desc {
187#define TYPHOON_TX_PF_VLAN_MASK cpu_to_le32(0x0ffff000) 187#define TYPHOON_TX_PF_VLAN_MASK cpu_to_le32(0x0ffff000)
188#define TYPHOON_TX_PF_INTERNAL cpu_to_le32(0xf0000000) 188#define TYPHOON_TX_PF_INTERNAL cpu_to_le32(0xf0000000)
189#define TYPHOON_TX_PF_VLAN_TAG_SHIFT 12 189#define TYPHOON_TX_PF_VLAN_TAG_SHIFT 12
190} __attribute__ ((packed)); 190} __packed;
191 191
192/* The TCP Segmentation offload option descriptor 192/* The TCP Segmentation offload option descriptor
193 * 193 *
@@ -208,7 +208,7 @@ struct tcpopt_desc {
208 __le32 respAddrLo; 208 __le32 respAddrLo;
209 __le32 bytesTx; 209 __le32 bytesTx;
210 __le32 status; 210 __le32 status;
211} __attribute__ ((packed)); 211} __packed;
212 212
213/* The IPSEC Offload descriptor 213/* The IPSEC Offload descriptor
214 * 214 *
@@ -227,7 +227,7 @@ struct ipsec_desc {
227 __le32 sa1; 227 __le32 sa1;
228 __le32 sa2; 228 __le32 sa2;
229 __le32 reserved; 229 __le32 reserved;
230} __attribute__ ((packed)); 230} __packed;
231 231
232/* The Typhoon receive descriptor (Updated by NIC) 232/* The Typhoon receive descriptor (Updated by NIC)
233 * 233 *
@@ -284,7 +284,7 @@ struct rx_desc {
284#define TYPHOON_RX_UNKNOWN_SA cpu_to_le16(0x0100) 284#define TYPHOON_RX_UNKNOWN_SA cpu_to_le16(0x0100)
285#define TYPHOON_RX_ESP_FORMAT_ERR cpu_to_le16(0x0200) 285#define TYPHOON_RX_ESP_FORMAT_ERR cpu_to_le16(0x0200)
286 __be32 vlanTag; 286 __be32 vlanTag;
287} __attribute__ ((packed)); 287} __packed;
288 288
289/* The Typhoon free buffer descriptor, used to give a buffer to the NIC 289/* The Typhoon free buffer descriptor, used to give a buffer to the NIC
290 * 290 *
@@ -301,7 +301,7 @@ struct rx_free {
301 __le32 physAddrHi; 301 __le32 physAddrHi;
302 u32 virtAddr; 302 u32 virtAddr;
303 u32 virtAddrHi; 303 u32 virtAddrHi;
304} __attribute__ ((packed)); 304} __packed;
305 305
306/* The Typhoon command descriptor, used for commands and responses 306/* The Typhoon command descriptor, used for commands and responses
307 * 307 *
@@ -347,7 +347,7 @@ struct cmd_desc {
347 __le16 parm1; 347 __le16 parm1;
348 __le32 parm2; 348 __le32 parm2;
349 __le32 parm3; 349 __le32 parm3;
350} __attribute__ ((packed)); 350} __packed;
351 351
352/* The Typhoon response descriptor, see command descriptor for details 352/* The Typhoon response descriptor, see command descriptor for details
353 */ 353 */
@@ -359,7 +359,7 @@ struct resp_desc {
359 __le16 parm1; 359 __le16 parm1;
360 __le32 parm2; 360 __le32 parm2;
361 __le32 parm3; 361 __le32 parm3;
362} __attribute__ ((packed)); 362} __packed;
363 363
364#define INIT_COMMAND_NO_RESPONSE(x, command) \ 364#define INIT_COMMAND_NO_RESPONSE(x, command) \
365 do { struct cmd_desc *_ptr = (x); \ 365 do { struct cmd_desc *_ptr = (x); \
@@ -427,7 +427,7 @@ struct stats_resp {
427#define TYPHOON_LINK_HALF_DUPLEX cpu_to_le32(0x00000000) 427#define TYPHOON_LINK_HALF_DUPLEX cpu_to_le32(0x00000000)
428 __le32 unused2; 428 __le32 unused2;
429 __le32 unused3; 429 __le32 unused3;
430} __attribute__ ((packed)); 430} __packed;
431 431
432/* TYPHOON_CMD_XCVR_SELECT xcvr values (resp.parm1) 432/* TYPHOON_CMD_XCVR_SELECT xcvr values (resp.parm1)
433 */ 433 */
@@ -488,7 +488,7 @@ struct sa_descriptor {
488 u32 index; 488 u32 index;
489 u32 unused; 489 u32 unused;
490 u32 unused2; 490 u32 unused2;
491} __attribute__ ((packed)); 491} __packed;
492 492
493/* TYPHOON_CMD_SET_OFFLOAD_TASKS bits (cmd.parm2 (Tx) & cmd.parm3 (Rx)) 493/* TYPHOON_CMD_SET_OFFLOAD_TASKS bits (cmd.parm2 (Tx) & cmd.parm3 (Rx))
494 * This is all for IPv4. 494 * This is all for IPv4.
@@ -518,14 +518,14 @@ struct typhoon_file_header {
518 __le32 numSections; 518 __le32 numSections;
519 __le32 startAddr; 519 __le32 startAddr;
520 __le32 hmacDigest[5]; 520 __le32 hmacDigest[5];
521} __attribute__ ((packed)); 521} __packed;
522 522
523struct typhoon_section_header { 523struct typhoon_section_header {
524 __le32 len; 524 __le32 len;
525 u16 checksum; 525 u16 checksum;
526 u16 reserved; 526 u16 reserved;
527 __le32 startAddr; 527 __le32 startAddr;
528} __attribute__ ((packed)); 528} __packed;
529 529
530/* The Typhoon Register offsets 530/* The Typhoon Register offsets
531 */ 531 */