diff options
author | Al Viro <viro@ftp.linux.org.uk> | 2007-12-21 07:21:14 +0100 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-12-23 04:53:06 +0100 |
commit | 71f1bb1a8f17db3caba1237dfd478c2a13faf63e (patch) | |
tree | 75b0060d7c93e4438f9fe1098109dc94c517e48f /drivers/net/typhoon.h | |
parent | typhoon: memory corruptor on big-endian if TSO is enabled (diff) | |
download | linux-71f1bb1a8f17db3caba1237dfd478c2a13faf63e.tar.xz linux-71f1bb1a8f17db3caba1237dfd478c2a13faf63e.zip |
typhoon: trivial endianness annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/typhoon.h')
-rw-r--r-- | drivers/net/typhoon.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/drivers/net/typhoon.h b/drivers/net/typhoon.h index a02e09593970..dd7022ca7354 100644 --- a/drivers/net/typhoon.h +++ b/drivers/net/typhoon.h @@ -166,8 +166,13 @@ struct tx_desc { #define TYPHOON_DESC_VALID 0x80 u8 numDesc; __le16 len; - u32 addr; - u32 addrHi; + union { + struct { + __le32 addr; + __le32 addrHi; + } frag; + u64 tx_addr; /* opaque for hardware, for TX_DESC */ + }; __le32 processFlags; #define TYPHOON_TX_PF_NO_CRC __constant_cpu_to_le32(0x00000001) #define TYPHOON_TX_PF_IP_CHKSUM __constant_cpu_to_le32(0x00000002) @@ -240,8 +245,8 @@ struct rx_desc { u8 flags; u8 numDesc; __le16 frameLen; - u32 addr; - u32 addrHi; + u32 addr; /* opaque, comes from virtAddr */ + u32 addrHi; /* opaque, comes from virtAddrHi */ __le32 rxStatus; #define TYPHOON_RX_ERR_INTERNAL __constant_cpu_to_le32(0x00000000) #define TYPHOON_RX_ERR_FIFO_UNDERRUN __constant_cpu_to_le32(0x00000001) |