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

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

diff --git a/include/linux/fib_rules.h b/include/linux/fib_rules.h
index c7e5b70..51da65b 100644 (file)
--- a/include/linux/fib_rules.h
+++ b/include/linux/fib_rules.h
@@ -8,7 +8,9 @@
 #define FIB_RULE_PERMANENT     0x00000001
 #define FIB_RULE_INVERT                0x00000002
 #define FIB_RULE_UNRESOLVED    0x00000004
-#define FIB_RULE_DEV_DETACHED  0x00000008
+#define FIB_RULE_IIF_DETACHED  0x00000008
+#define FIB_RULE_DEV_DETACHED  FIB_RULE_IIF_DETACHED
+#define FIB_RULE_OIF_DETACHED  0x00000010
 
 /* try to find source address in routing lookups */
 #define FIB_RULE_FIND_SADDR    0x00010000
@@ -31,7 +33,8 @@ enum {
        FRA_UNSPEC,
        FRA_DST,        /* destination address */
        FRA_SRC,        /* source address */
-       FRA_IFNAME,     /* interface name */
+       FRA_IIFNAME,    /* interface name */
+#define FRA_IFNAME     FRA_IIFNAME
        FRA_GOTO,       /* target to jump to (FR_ACT_GOTO) */
        FRA_UNUSED2,
        FRA_PRIORITY,   /* priority/preference */
@@ -45,6 +48,7 @@ enum {
        FRA_UNUSED8,
        FRA_TABLE,      /* Extended table id */
        FRA_FWMASK,     /* mask for netfilter mark */
+       FRA_OIFNAME,
        __FRA_MAX
 };