net: rename skb->iif to skb->skb_iif

To help grep games, rename iif to skb_iif

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 4 insertions, 4 deletions

diff --git a/net/core/dev.c b/net/core/dev.c
index 9977288583b8..09f3d6b9c0c8 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2287,7 +2287,7 @@ static int ing_filter(struct sk_buff *skb)
         if (MAX_RED_LOOP < ttl++) {
                 printk(KERN_WARNING
                        "Redir loop detected Dropping packet (%d->%d)\n",
-                       skb->iif, dev->ifindex);
+                       skb->skb_iif, dev->ifindex);
                 return TC_ACT_SHOT;
         }
 
@@ -2395,8 +2395,8 @@ int netif_receive_skb(struct sk_buff *skb)
         if (netpoll_receive_skb(skb))
                 return NET_RX_DROP;
 
-        if (!skb->iif)
-                skb->iif = skb->dev->ifindex;
+        if (!skb->skb_iif)
+                skb->skb_iif = skb->dev->ifindex;
 
         null_or_orig = NULL;
         orig_dev = skb->dev;
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 739b8f4dd327..bfa3e7865a8c 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -549,7 +549,7 @@ static void __copy_skb_header(struct sk_buff *new, const struct sk_buff *old)
 #endif
         new->protocol           = old->protocol;
         new->mark               = old->mark;
-        new->iif                = old->iif;
+        new->skb_iif            = old->skb_iif;
         __nf_copy(new, old);
 #if defined(CONFIG_NETFILTER_XT_TARGET_TRACE) || \
     defined(CONFIG_NETFILTER_XT_TARGET_TRACE_MODULE)