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>

11 files changed, 20 insertions, 20 deletions

diff --git a/drivers/ieee802154/fakehard.c b/drivers/ieee802154/fakehard.c
index f877f13e3ab3..617549f30ef9 100644
--- a/drivers/ieee802154/fakehard.c
+++ b/drivers/ieee802154/fakehard.c
@@ -282,7 +282,7 @@ static int ieee802154_fake_close(struct net_device *dev)
 static netdev_tx_t ieee802154_fake_xmit(struct sk_buff *skb,
                                               struct net_device *dev)
 {
-        skb->iif = dev->ifindex;
+        skb->skb_iif = dev->ifindex;
         skb->dev = dev;
         dev->stats.tx_packets++;
         dev->stats.tx_bytes += skb->len;
diff --git a/drivers/net/ifb.c b/drivers/net/ifb.c
index 69c25668dd63..f4081c0a2d9c 100644
--- a/drivers/net/ifb.c
+++ b/drivers/net/ifb.c
@@ -99,7 +99,7 @@ static void ri_tasklet(unsigned long dev)
                 stats->tx_bytes +=skb->len;
 
                 rcu_read_lock();
-                skb->dev = dev_get_by_index_rcu(&init_net, skb->iif);
+                skb->dev = dev_get_by_index_rcu(&init_net, skb->skb_iif);
                 if (!skb->dev) {
                         rcu_read_unlock();
                         dev_kfree_skb(skb);
@@ -107,7 +107,7 @@ static void ri_tasklet(unsigned long dev)
                         break;
                 }
                 rcu_read_unlock();
-                skb->iif = _dev->ifindex;
+                skb->skb_iif = _dev->ifindex;
 
                 if (from & AT_EGRESS) {
                         dp->st_rx_frm_egr++;
@@ -172,7 +172,7 @@ static netdev_tx_t ifb_xmit(struct sk_buff *skb, struct net_device *dev)
         stats->rx_packets++;
         stats->rx_bytes+=skb->len;
 
-        if (!(from & (AT_INGRESS|AT_EGRESS)) || !skb->iif) {
+        if (!(from & (AT_INGRESS|AT_EGRESS)) || !skb->skb_iif) {
                 dev_kfree_skb(skb);
                 stats->rx_dropped++;
                 return NETDEV_TX_OK;
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 63f47426977a..89eed8cdd318 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -299,7 +299,7 @@ typedef unsigned char *sk_buff_data_t;
  *      @nfctinfo: Relationship of this skb to the connection
  *      @nfct_reasm: netfilter conntrack re-assembly pointer
  *      @nf_bridge: Saved data about a bridged frame - see br_netfilter.c
- *      @iif: ifindex of device we arrived on
+ *      @skb_iif: ifindex of device we arrived on
  *      @queue_mapping: Queue mapping for multiqueue devices
  *      @tc_index: Traffic control index
  *      @tc_verd: traffic control verdict
@@ -366,7 +366,7 @@ struct sk_buff {
         struct nf_bridge_info   *nf_bridge;
 #endif
 
-        int                     iif;
+        int                     skb_iif;
 #ifdef CONFIG_NET_SCHED
         __u16                   tc_index;       /* traffic control index */
 #ifdef CONFIG_NET_CLS_ACT
diff --git a/include/net/pkt_cls.h b/include/net/pkt_cls.h
index 3dd210d073ca..dd3031aed9d5 100644
--- a/include/net/pkt_cls.h
+++ b/include/net/pkt_cls.h
@@ -343,9 +343,9 @@ tcf_match_indev(struct sk_buff *skb, char *indev)
         struct net_device *dev;
 
         if (indev[0]) {
-                if  (!skb->iif)
+                if  (!skb->skb_iif)
                         return 0;
-                dev = __dev_get_by_index(dev_net(skb->dev), skb->iif);
+                dev = __dev_get_by_index(dev_net(skb->dev), skb->skb_iif);
                 if (!dev || strcmp(indev, dev->name))
                         return 0;
         }
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)
diff --git a/net/netlabel/netlabel_unlabeled.c b/net/netlabel/netlabel_unlabeled.c
index 3dfe2bac8623..98ed22ee2ff4 100644
--- a/net/netlabel/netlabel_unlabeled.c
+++ b/net/netlabel/netlabel_unlabeled.c
@@ -1550,7 +1550,7 @@ int netlbl_unlabel_getattr(const struct sk_buff *skb,
         struct netlbl_unlhsh_iface *iface;
 
         rcu_read_lock();
-        iface = netlbl_unlhsh_search_iface_def(skb->iif);
+        iface = netlbl_unlhsh_search_iface_def(skb->skb_iif);
         if (iface == NULL)
                 goto unlabel_getattr_nolabel;
         switch (family) {
diff --git a/net/sched/act_mirred.c b/net/sched/act_mirred.c
index 797479369881..d329170243cb 100644
--- a/net/sched/act_mirred.c
+++ b/net/sched/act_mirred.c
@@ -185,7 +185,7 @@ static int tcf_mirred(struct sk_buff *skb, struct tc_action *a,
                 skb2->tc_verd = SET_TC_FROM(skb2->tc_verd, at);
 
         skb2->dev = dev;
-        skb2->iif = skb->dev->ifindex;
+        skb2->skb_iif = skb->dev->ifindex;
         dev_queue_xmit(skb2);
         err = 0;
 
diff --git a/net/sched/cls_flow.c b/net/sched/cls_flow.c
index 9402a7fd3785..e054c62857e1 100644
--- a/net/sched/cls_flow.c
+++ b/net/sched/cls_flow.c
@@ -171,7 +171,7 @@ static u32 flow_get_proto_dst(const struct sk_buff *skb)
 
 static u32 flow_get_iif(const struct sk_buff *skb)
 {
-        return skb->iif;
+        return skb->skb_iif;
 }
 
 static u32 flow_get_priority(const struct sk_buff *skb)
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index bb230d5d7085..83a4aada0b4c 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -4085,7 +4085,7 @@ static int selinux_sock_rcv_skb_compat(struct sock *sk, struct sk_buff *skb,
         char *addrp;
 
         COMMON_AUDIT_DATA_INIT(&ad, NET);
-        ad.u.net.netif = skb->iif;
+        ad.u.net.netif = skb->skb_iif;
         ad.u.net.family = family;
         err = selinux_parse_skb(skb, &ad, &addrp, 1, NULL);
         if (err)
@@ -4147,7 +4147,7 @@ static int selinux_socket_sock_rcv_skb(struct sock *sk, struct sk_buff *skb)
                 return 0;
 
         COMMON_AUDIT_DATA_INIT(&ad, NET);
-        ad.u.net.netif = skb->iif;
+        ad.u.net.netif = skb->skb_iif;
         ad.u.net.family = family;
         err = selinux_parse_skb(skb, &ad, &addrp, 1, NULL);
         if (err)
@@ -4159,7 +4159,7 @@ static int selinux_socket_sock_rcv_skb(struct sock *sk, struct sk_buff *skb)
                 err = selinux_skb_peerlbl_sid(skb, family, &peer_sid);
                 if (err)
                         return err;
-                err = selinux_inet_sys_rcv_skb(skb->iif, addrp, family,
+                err = selinux_inet_sys_rcv_skb(skb->skb_iif, addrp, family,
                                                peer_sid, &ad);
                 if (err) {
                         selinux_netlbl_err(skb, err, 0);
diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
index c33b6bb9b6dd..529c9ca65878 100644
--- a/security/smack/smack_lsm.c
+++ b/security/smack/smack_lsm.c
@@ -2602,7 +2602,7 @@ static int smack_socket_sock_rcv_skb(struct sock *sk, struct sk_buff *skb)
 #ifdef CONFIG_AUDIT
         smk_ad_init(&ad, __func__, LSM_AUDIT_DATA_NET);
         ad.a.u.net.family = sk->sk_family;
-        ad.a.u.net.netif = skb->iif;
+        ad.a.u.net.netif = skb->skb_iif;
         ipv4_skb_to_auditdata(skb, &ad.a, NULL);
 #endif
         /*
@@ -2757,7 +2757,7 @@ static int smack_inet_conn_request(struct sock *sk, struct sk_buff *skb,
 #ifdef CONFIG_AUDIT
         smk_ad_init(&ad, __func__, LSM_AUDIT_DATA_NET);
         ad.a.u.net.family = family;
-        ad.a.u.net.netif = skb->iif;
+        ad.a.u.net.netif = skb->skb_iif;
         ipv4_skb_to_auditdata(skb, &ad.a, NULL);
 #endif
         /*