git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
include
/
linux
/
ipx.h
diff --git
a/include/linux/ipx.h
b/include/linux/ipx.h
index
4f29c60
..
eb19b4e
100644
(file)
--- a/
include/linux/ipx.h
+++ b/
include/linux/ipx.h
@@
-7,8
+7,8
@@
struct sockaddr_ipx {
sa_family_t sipx_family;
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 */
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 {
#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 {
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
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 {
*/
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];
#define IPX_ROUTE_NO_ROUTER 0
unsigned char ipx_router_node[IPX_NODE_LEN];
unsigned char ipx_device[16];