net 02/05: fib_rules: rename ifindex/ifname/FRA_IFNAME to iifindex/iifname/FRA_IIFNAME

commit 229e77eec406ad68662f18e49fda8b5d366768c5
Author: Patrick McHardy <kaber@trash.net>
Date:   Thu Dec 3 12:05:23 2009 +0100

    net: fib_rules: rename ifindex/ifname/FRA_IFNAME to iifindex/iifname/FRA_IIFNAME

    The next patch will add oif classification, rename interface related members
    and attributes to reflect that they're used for iif classification.

    Signed-off-by: Patrick McHardy <kaber@trash.net>

Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 7 insertions, 5 deletions

diff --git a/include/linux/fib_rules.h b/include/linux/fib_rules.h
index c7e5b700bb9..7e11bb2fa65 100644
--- a/include/linux/fib_rules.h
+++ b/include/linux/fib_rules.h
@@ -8,7 +8,8 @@
 #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
 
 /* try to find source address in routing lookups */
 #define FIB_RULE_FIND_SADDR     0x00010000
@@ -31,7 +32,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 */
diff --git a/include/net/fib_rules.h b/include/net/fib_rules.h
index 22fb323cd85..62bebcb2a51 100644
--- a/include/net/fib_rules.h
+++ b/include/net/fib_rules.h
@@ -10,7 +10,7 @@
 struct fib_rule {
         struct list_head        list;
         atomic_t                refcnt;
-        int                     ifindex;
+        int                     iifindex;
         u32                     mark;
         u32                     mark_mask;
         u32                     pref;
@@ -19,7 +19,7 @@ struct fib_rule {
         u8                      action;
         u32                     target;
         struct fib_rule *       ctarget;
-        char                    ifname[IFNAMSIZ];
+        char                    iifname[IFNAMSIZ];
         struct rcu_head         rcu;
         struct net *            fr_net;
 };
@@ -67,7 +67,7 @@ struct fib_rules_ops {
 };
 
 #define FRA_GENERIC_POLICY \
-        [FRA_IFNAME]    = { .type = NLA_STRING, .len = IFNAMSIZ - 1 }, \
+        [FRA_IIFNAME]   = { .type = NLA_STRING, .len = IFNAMSIZ - 1 }, \
         [FRA_PRIORITY]  = { .type = NLA_U32 }, \
         [FRA_FWMARK]    = { .type = NLA_U32 }, \
         [FRA_FWMASK]    = { .type = NLA_U32 }, \