diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-11-06 06:10:04 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-11-06 06:10:04 +0300 |
| commit | d1ed6a3ea10aa7b199c434f6ffd1b6761896567a (patch) | |
| tree | ad65f11ace691a630885607604e1da0aa16db820 /include/linux | |
| parent | 59359ff87700f5e742c96a55da9cf0819984c128 (diff) | |
| parent | 38c94377a36f70e86665231c9f477e445c806618 (diff) | |
| download | linux-d1ed6a3ea10aa7b199c434f6ffd1b6761896567a.tar.xz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[NETLABEL]: Fix build failure.
[IPV6]: Give sit driver an appropriate module alias.
[IPV6]: Add ndisc_netdev_notifier unregister.
[NET]: __alloc_pages() failures reported due to fragmentation
[PKTGEN]: TCI endianness fixes
[TG3]: Fix 2nd ifup failure on 5752M.
[NETFILTER] bug: skb->protocol is already net-endian
[NETFILTER] bug: nfulnl_msg_config_mode ->copy_range is 32bit
[NETFILTER] bug: NFULA_CFG_QTHRESH uses 32bit
[IPV6]: Fix ECN bug on big-endian
[IPX]: Annotate and fix IPX checksum
[IPX]: Trivial parts of endianness annotations
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/ipx.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/include/linux/ipx.h b/include/linux/ipx.h index 4f29c60964c4..eb19b4ea84f4 100644 --- a/include/linux/ipx.h +++ b/include/linux/ipx.h @@ -7,8 +7,8 @@ struct sockaddr_ipx { sa_family_t sipx_family; - __u16 sipx_port; - __u32 sipx_network; + __be16 sipx_port; + __be32 sipx_network; unsigned char sipx_node[IPX_NODE_LEN]; __u8 sipx_type; unsigned char sipx_zero; /* 16 byte fill */ @@ -23,13 +23,13 @@ struct sockaddr_ipx { #define IPX_CRTITF 1 struct ipx_route_definition { - __u32 ipx_network; - __u32 ipx_router_network; + __be32 ipx_network; + __be32 ipx_router_network; unsigned char ipx_router_node[IPX_NODE_LEN]; }; struct ipx_interface_definition { - __u32 ipx_network; + __be32 ipx_network; unsigned char ipx_device[16]; unsigned char ipx_dlink_type; #define IPX_FRAME_NONE 0 @@ -55,8 +55,8 @@ struct ipx_config_data { */ struct ipx_route_def { - __u32 ipx_network; - __u32 ipx_router_network; + __be32 ipx_network; + __be32 ipx_router_network; #define IPX_ROUTE_NO_ROUTER 0 unsigned char ipx_router_node[IPX_NODE_LEN]; unsigned char ipx_device[16]; |