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
/
net
/
ndisc.h
diff --git
a/include/net/ndisc.h
b/include/net/ndisc.h
index
bbac87e
..
475b10c
100644
(file)
--- a/
include/net/ndisc.h
+++ b/
include/net/ndisc.h
@@
-22,6
+22,8
@@
enum {
ND_OPT_PREFIX_INFO = 3, /* RFC2461 */
ND_OPT_REDIRECT_HDR = 4, /* RFC2461 */
ND_OPT_MTU = 5, /* RFC2461 */
ND_OPT_PREFIX_INFO = 3, /* RFC2461 */
ND_OPT_REDIRECT_HDR = 4, /* RFC2461 */
ND_OPT_MTU = 5, /* RFC2461 */
+ __ND_OPT_ARRAY_MAX,
+ ND_OPT_ROUTE_INFO = 24, /* RFC4191 */
__ND_OPT_MAX
};
__ND_OPT_MAX
};
@@
-35,7
+37,6
@@
enum {
#ifdef __KERNEL__
#ifdef __KERNEL__
-#include <linux/config.h>
#include <linux/compiler.h>
#include <linux/icmpv6.h>
#include <linux/in6.h>
#include <linux/compiler.h>
#include <linux/icmpv6.h>
#include <linux/in6.h>
@@
-65,8
+66,8
@@
struct rs_msg {
struct ra_msg {
struct icmp6hdr icmph;
struct ra_msg {
struct icmp6hdr icmph;
- __
u32
reachable_time;
- __
u32
retrans_timer;
+ __
be32
reachable_time;
+ __
be32
retrans_timer;
};
struct nd_opt_hdr {
};
struct nd_opt_hdr {