2 files changed, 18 insertions, 18 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];
diff --git a/include/net/ipx.h b/include/net/ipx.h
index 5c0cf33826c5..4a423d2695ba 100644
--- a/include/net/ipx.h
+++ b/include/net/ipx.h
@@ -15,9 +15,9 @@
 #include <linux/list.h>
 
 struct ipx_address {
-        __u32   net;
+        __be32  net;
         __u8    node[IPX_NODE_LEN]; 
-        __u16   sock;
+        __be16  sock;
 };
 
 #define ipx_broadcast_node      "\377\377\377\377\377\377"
@@ -28,7 +28,7 @@ struct ipx_address {
 struct ipxhdr {
         __u16                   ipx_checksum __attribute__ ((packed));
 #define IPX_NO_CHECKSUM 0xFFFF
-        __u16                   ipx_pktsize __attribute__ ((packed));
+        __be16                  ipx_pktsize __attribute__ ((packed));
         __u8                    ipx_tctrl;
         __u8                    ipx_type;
 #define IPX_TYPE_UNKNOWN        0x00
@@ -48,14 +48,14 @@ static __inline__ struct ipxhdr *ipx_hdr(struct sk_buff *skb)
 
 struct ipx_interface {
         /* IPX address */
-        __u32                   if_netnum;
+        __be32                  if_netnum;
         unsigned char           if_node[IPX_NODE_LEN];
         atomic_t                refcnt;
 
         /* physical device info */
         struct net_device       *if_dev;
         struct datalink_proto   *if_dlink;
-        unsigned short          if_dlink_type;
+        __be16                  if_dlink_type;
 
         /* socket support */
         unsigned short          if_sknum;
@@ -71,7 +71,7 @@ struct ipx_interface {
 };
 
 struct ipx_route {
-        __u32                   ir_net;
+        __be32                  ir_net;
         struct ipx_interface    *ir_intrfc;
         unsigned char           ir_routed;
         unsigned char           ir_router_node[IPX_NODE_LEN];
@@ -82,10 +82,10 @@ struct ipx_route {
 #ifdef __KERNEL__
 struct ipx_cb {
         u8      ipx_tctrl;
-        u32     ipx_dest_net;
-        u32     ipx_source_net;
+        __be32  ipx_dest_net;
+        __be32  ipx_source_net;
         struct {
-                u32 netnum;
+                __be32 netnum;
                 int index;
         } last_hop;
 };
@@ -97,7 +97,7 @@ struct ipx_sock {
         struct sock             sk;
         struct ipx_address      dest_addr;
         struct ipx_interface    *intrfc;
-        unsigned short          port;
+        __be16                  port;
 #ifdef CONFIG_IPX_INTERN
         unsigned char           node[IPX_NODE_LEN];
 #endif
@@ -132,7 +132,7 @@ extern struct ipx_interface *ipx_primary_net;
 extern int ipx_proc_init(void);
 extern void ipx_proc_exit(void);
 
-extern const char *ipx_frame_name(unsigned short);
+extern const char *ipx_frame_name(__be16);
 extern const char *ipx_device_name(struct ipx_interface *intrfc);
 
 static __inline__ void ipxitf_hold(struct ipx_interface *intrfc)