Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2005-12-22 09:41:03 -08:00
parent b31c78e2d6 e6469297d4
commit c162eeaa21
9 changed files with 161 additions and 25 deletions
@@ -18,6 +18,7 @@
 					   fallback, no routers on link */
 #define RTF_ADDRCONF	0x00040000	/* addrconf route - RA		*/
 #define RTF_PREFIX_RT	0x00080000	/* A prefix only route - RA	*/
+#define RTF_ANYCAST	0x00100000	/* Anycast			*/

 #define RTF_NONEXTHOP	0x00200000	/* route with no nexthop	*/
 #define RTF_EXPIRES	0x00400000
@@ -24,6 +24,7 @@
 #define IF_RA_MANAGED	0x40
 #define IF_RA_RCVD	0x20
 #define IF_RS_SENT	0x10
+#define IF_READY	0x80000000

 /* prefix flags */
 #define IF_PREFIX_ONLINK	0x01