aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-11-05 19:10:04 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-11-05 19:10:04 -0800
commitd1ed6a3ea10aa7b199c434f6ffd1b6761896567a (patch)
treead65f11ace691a630885607604e1da0aa16db820 /include
parent59359ff87700f5e742c96a55da9cf0819984c128 (diff)
parent38c94377a36f70e86665231c9f477e445c806618 (diff)
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')
-rw-r--r--include/linux/ipx.h14
-rw-r--r--include/net/inet_ecn.h2
-rw-r--r--include/net/ipx.h26
3 files changed, 21 insertions, 21 deletions
diff --git a/include/linux/ipx.h b/include/linux/ipx.h
index 4f29c60964c..eb19b4ea84f 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/inet_ecn.h b/include/net/inet_ecn.h
index d599c6bfbb8..7849844a491 100644
--- a/include/net/inet_ecn.h
+++ b/include/net/inet_ecn.h
@@ -48,7 +48,7 @@ static inline __u8 INET_ECN_encapsulate(__u8 outer, __u8 inner)
#define IP6_ECN_flow_xmit(sk, label) do { \
if (INET_ECN_is_capable(inet_sk(sk)->tos)) \
- (label) |= __constant_htons(INET_ECN_ECT_0 << 4); \
+ (label) |= htonl(INET_ECN_ECT_0 << 20); \
} while (0)
static inline int IP_ECN_set_ce(struct iphdr *iph)
diff --git a/include/net/ipx.h b/include/net/ipx.h
index 5c0cf33826c..c6b2ee61086 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"
@@ -26,9 +26,9 @@ struct ipx_address {
#define IPX_MAX_PPROP_HOPS 8
struct ipxhdr {
- __u16 ipx_checksum __attribute__ ((packed));
-#define IPX_NO_CHECKSUM 0xFFFF
- __u16 ipx_pktsize __attribute__ ((packed));
+ __be16 ipx_checksum __attribute__ ((packed));
+#define IPX_NO_CHECKSUM __constant_htons(0xFFFF)
+ __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)