diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-22 12:41:03 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-22 12:41:03 -0500 |
| commit | c162eeaa21fde6c27112690f5bc0a461a9f1763e (patch) | |
| tree | 022e1162c2ef3f83d6214fdc7f3678bc5545714a /include | |
| parent | b31c78e2d6b45a51413c7ec08d703e43f5fb16b3 (diff) | |
| parent | e6469297d4eecfd9f46929fe1f56a01141cb0791 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/ipv6_route.h | 1 | ||||
| -rw-r--r-- | include/net/if_inet6.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/ipv6_route.h b/include/linux/ipv6_route.h index e2f935038013..d7c41d1d706a 100644 --- a/include/linux/ipv6_route.h +++ b/include/linux/ipv6_route.h | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | fallback, no routers on link */ | 18 | fallback, no routers on link */ |
| 19 | #define RTF_ADDRCONF 0x00040000 /* addrconf route - RA */ | 19 | #define RTF_ADDRCONF 0x00040000 /* addrconf route - RA */ |
| 20 | #define RTF_PREFIX_RT 0x00080000 /* A prefix only route - RA */ | 20 | #define RTF_PREFIX_RT 0x00080000 /* A prefix only route - RA */ |
| 21 | #define RTF_ANYCAST 0x00100000 /* Anycast */ | ||
| 21 | 22 | ||
| 22 | #define RTF_NONEXTHOP 0x00200000 /* route with no nexthop */ | 23 | #define RTF_NONEXTHOP 0x00200000 /* route with no nexthop */ |
| 23 | #define RTF_EXPIRES 0x00400000 | 24 | #define RTF_EXPIRES 0x00400000 |
diff --git a/include/net/if_inet6.h b/include/net/if_inet6.h index e97a9accb71d..d8234f9bd4c4 100644 --- a/include/net/if_inet6.h +++ b/include/net/if_inet6.h | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | #define IF_RA_MANAGED 0x40 | 24 | #define IF_RA_MANAGED 0x40 |
| 25 | #define IF_RA_RCVD 0x20 | 25 | #define IF_RA_RCVD 0x20 |
| 26 | #define IF_RS_SENT 0x10 | 26 | #define IF_RS_SENT 0x10 |
| 27 | #define IF_READY 0x80000000 | ||
| 27 | 28 | ||
| 28 | /* prefix flags */ | 29 | /* prefix flags */ |
| 29 | #define IF_PREFIX_ONLINK 0x01 | 30 | #define IF_PREFIX_ONLINK 0x01 |