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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
linux
/
in6.h
diff --git
a/include/linux/in6.h
b/include/linux/in6.h
index
304aaed
..
4e8350a
100644
(file)
--- a/
include/linux/in6.h
+++ b/
include/linux/in6.h
@@
-32,8
+32,8
@@
struct in6_addr
union
{
__u8 u6_addr8[16];
union
{
__u8 u6_addr8[16];
- __
u16
u6_addr16[8];
- __
u32
u6_addr32[4];
+ __
be16
u6_addr16[8];
+ __
be32
u6_addr32[4];
} in6_u;
#define s6_addr in6_u.u6_addr8
#define s6_addr16 in6_u.u6_addr16
} in6_u;
#define s6_addr in6_u.u6_addr8
#define s6_addr16 in6_u.u6_addr16
@@
-53,8
+53,8
@@
extern const struct in6_addr in6addr_loopback;
struct sockaddr_in6 {
unsigned short int sin6_family; /* AF_INET6 */
struct sockaddr_in6 {
unsigned short int sin6_family; /* AF_INET6 */
- __
u16
sin6_port; /* Transport layer port # */
- __
u32
sin6_flowinfo; /* IPv6 flow information */
+ __
be16
sin6_port; /* Transport layer port # */
+ __
be32
sin6_flowinfo; /* IPv6 flow information */
struct in6_addr sin6_addr; /* IPv6 address */
__u32 sin6_scope_id; /* scope id (new in RFC2553) */
};
struct in6_addr sin6_addr; /* IPv6 address */
__u32 sin6_scope_id; /* scope id (new in RFC2553) */
};
@@
-72,7
+72,7
@@
struct ipv6_mreq {
struct in6_flowlabel_req
{
struct in6_addr flr_dst;
struct in6_flowlabel_req
{
struct in6_addr flr_dst;
- __
u32
flr_label;
+ __
be32
flr_label;
__u8 flr_action;
__u8 flr_share;
__u16 flr_flags;
__u8 flr_action;
__u8 flr_share;
__u16 flr_flags;
@@
-134,6
+134,7
@@
struct in6_flowlabel_req
#define IPPROTO_ICMPV6 58 /* ICMPv6 */
#define IPPROTO_NONE 59 /* IPv6 no next header */
#define IPPROTO_DSTOPTS 60 /* IPv6 destination options */
#define IPPROTO_ICMPV6 58 /* ICMPv6 */
#define IPPROTO_NONE 59 /* IPv6 no next header */
#define IPPROTO_DSTOPTS 60 /* IPv6 destination options */
+#define IPPROTO_MH 135 /* IPv6 mobility header */
/*
* IPv6 TLV options.
/*
* IPv6 TLV options.
@@
-142,6
+143,7
@@
struct in6_flowlabel_req
#define IPV6_TLV_PADN 1
#define IPV6_TLV_ROUTERALERT 5
#define IPV6_TLV_JUMBO 194
#define IPV6_TLV_PADN 1
#define IPV6_TLV_ROUTERALERT 5
#define IPV6_TLV_JUMBO 194
+#define IPV6_TLV_HAO 201 /* home address option */
/*
* IPV6 socket options
/*
* IPV6 socket options
@@
-223,7
+225,7
@@
struct in6_flowlabel_req
#endif
/*
#endif
/*
- * Netfilter
+ * Netfilter
(1)
*
* Following socket options are used in ip6_tables;
* see include/linux/netfilter_ipv6/ip6_tables.h.
*
* Following socket options are used in ip6_tables;
* see include/linux/netfilter_ipv6/ip6_tables.h.
@@
-238,4
+240,14
@@
struct in6_flowlabel_req
#define IPV6_RECVTCLASS 66
#define IPV6_TCLASS 67
#define IPV6_RECVTCLASS 66
#define IPV6_TCLASS 67
+/*
+ * Netfilter (2)
+ *
+ * Following socket options are used in ip6_tables;
+ * see include/linux/netfilter_ipv6/ip6_tables.h.
+ *
+ * IP6T_SO_GET_REVISION_MATCH 68
+ * IP6T_SO_GET_REVISION_TARGET 69
+ */
+
#endif
#endif