diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-10-11 11:56:12 +0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-10-11 11:56:12 +0400 |
commit | 24fcbacedb0d83cabc6761acbecfbf751265ce52 (patch) | |
tree | 7147b206304b028c3cfd5de6317e5c8510098ca9 /drivers/net/chelsio/cpl5_cmd.h | |
parent | 2f614fe04f4463ff22234133319067d7361f54e5 (diff) | |
parent | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff) | |
download | linux-24fcbacedb0d83cabc6761acbecfbf751265ce52.tar.xz |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/net/chelsio/cpl5_cmd.h')
-rw-r--r-- | drivers/net/chelsio/cpl5_cmd.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/chelsio/cpl5_cmd.h b/drivers/net/chelsio/cpl5_cmd.h index 27925e487bcf..5b357d9e88d6 100644 --- a/drivers/net/chelsio/cpl5_cmd.h +++ b/drivers/net/chelsio/cpl5_cmd.h @@ -108,7 +108,7 @@ struct cpl_tx_pkt_lso { u8 iff:4; #endif u16 vlan; - u32 len; + __be32 len; u32 rsvd2; u8 rsvd3; @@ -119,7 +119,7 @@ struct cpl_tx_pkt_lso { u8 ip_hdr_words:4; u8 tcp_hdr_words:4; #endif - u16 eth_type_mss; + __be16 eth_type_mss; }; struct cpl_rx_pkt { @@ -138,7 +138,7 @@ struct cpl_rx_pkt { u8 iff:4; #endif u16 csum; - u16 vlan; + __be16 vlan; u16 len; }; |