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
/
icmpv6.h
diff --git
a/include/linux/icmpv6.h
b/include/linux/icmpv6.h
index
0cf6c8b
..
68d3526
100644
(file)
--- a/
include/linux/icmpv6.h
+++ b/
include/linux/icmpv6.h
@@
-7,17
+7,17
@@
struct icmp6hdr {
__u8 icmp6_type;
__u8 icmp6_code;
__u8 icmp6_type;
__u8 icmp6_code;
- __
u16
icmp6_cksum;
+ __
sum16
icmp6_cksum;
union {
union {
- __
u32
un_data32[1];
- __
u16
un_data16[2];
+ __
be32
un_data32[1];
+ __
be16
un_data16[2];
__u8 un_data8[4];
struct icmpv6_echo {
__u8 un_data8[4];
struct icmpv6_echo {
- __
u16
identifier;
- __
u16
sequence;
+ __
be16
identifier;
+ __
be16
sequence;
} u_echo;
struct icmpv6_nd_advt {
} u_echo;
struct icmpv6_nd_advt {
@@
-40,18
+40,20
@@
struct icmp6hdr {
struct icmpv6_nd_ra {
__u8 hop_limit;
#if defined(__LITTLE_ENDIAN_BITFIELD)
struct icmpv6_nd_ra {
__u8 hop_limit;
#if defined(__LITTLE_ENDIAN_BITFIELD)
- __u8 reserved:6,
+ __u8 reserved:4,
+ router_pref:2,
other:1,
managed:1;
#elif defined(__BIG_ENDIAN_BITFIELD)
__u8 managed:1,
other:1,
other:1,
managed:1;
#elif defined(__BIG_ENDIAN_BITFIELD)
__u8 managed:1,
other:1,
- reserved:6;
+ router_pref:2,
+ reserved:4;
#else
#error "Please fix <asm/byteorder.h>"
#endif
#else
#error "Please fix <asm/byteorder.h>"
#endif
- __
u16
rt_lifetime;
+ __
be16
rt_lifetime;
} u_nd_ra;
} icmp6_dataun;
} u_nd_ra;
} icmp6_dataun;
@@
-70,8
+72,13
@@
struct icmp6hdr {
#define icmp6_addrconf_managed icmp6_dataun.u_nd_ra.managed
#define icmp6_addrconf_other icmp6_dataun.u_nd_ra.other
#define icmp6_rt_lifetime icmp6_dataun.u_nd_ra.rt_lifetime
#define icmp6_addrconf_managed icmp6_dataun.u_nd_ra.managed
#define icmp6_addrconf_other icmp6_dataun.u_nd_ra.other
#define icmp6_rt_lifetime icmp6_dataun.u_nd_ra.rt_lifetime
+#define icmp6_router_pref icmp6_dataun.u_nd_ra.router_pref
};
};
+#define ICMPV6_ROUTER_PREF_LOW 0x3
+#define ICMPV6_ROUTER_PREF_MEDIUM 0x0
+#define ICMPV6_ROUTER_PREF_HIGH 0x1
+#define ICMPV6_ROUTER_PREF_INVALID 0x2
#define ICMPV6_DEST_UNREACH 1
#define ICMPV6_PKT_TOOBIG 2
#define ICMPV6_DEST_UNREACH 1
#define ICMPV6_PKT_TOOBIG 2