Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke...

[pandora-kernel.git] / include / linux / fib_rules.h

diff --git a/include/linux/fib_rules.h b/include/linux/fib_rules.h
index c151273..87b606b 100644 (file)
--- a/include/linux/fib_rules.h
+++ b/include/linux/fib_rules.h
@@ -5,10 +5,13 @@
 #include <linux/rtnetlink.h>
 
 /* rule is permanent, and cannot be deleted */
-#define FIB_RULE_PERMANENT     1
-#define FIB_RULE_INVERT                2
-#define FIB_RULE_UNRESOLVED    4
-#define FIB_RULE_DEV_DETACHED  8
+#define FIB_RULE_PERMANENT     0x00000001
+#define FIB_RULE_INVERT                0x00000002
+#define FIB_RULE_UNRESOLVED    0x00000004
+#define FIB_RULE_DEV_DETACHED  0x00000008
+
+/* try to find source address in routing lookups */
+#define FIB_RULE_FIND_SADDR    0x00010000
 
 struct fib_rule_hdr
 {
@@ -54,7 +57,7 @@ enum
        FR_ACT_UNSPEC,
        FR_ACT_TO_TBL,          /* Pass to fixed table */
        FR_ACT_GOTO,            /* Jump to another rule */
-       FR_ACT_RES2,
+       FR_ACT_NOP,             /* No operation */
        FR_ACT_RES3,
        FR_ACT_RES4,
        FR_ACT_BLACKHOLE,       /* Drop without notification */