summaryrefslogtreecommitdiffstats
path: root/include/linux/skbuff.h
diff options
context:
space:
mode:
authorEric Dumazet2009-11-21 00:35:04 +0100
committerDavid S. Miller2009-11-21 00:35:04 +0100
commit8964be4a9a5ca8cab1219bb046db2f6d1936227c (patch)
tree8838c73a03cc69c010b55928fce3725d17bc26a9 /include/linux/skbuff.h
parentbe2net: Patch to flash redboot section while firmware update. (diff)
downloadkernel-qcow2-linux-8964be4a9a5ca8cab1219bb046db2f6d1936227c.tar.gz
kernel-qcow2-linux-8964be4a9a5ca8cab1219bb046db2f6d1936227c.tar.xz
kernel-qcow2-linux-8964be4a9a5ca8cab1219bb046db2f6d1936227c.zip
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>
Diffstat (limited to 'include/linux/skbuff.h')
-rw-r--r--include/linux/skbuff.h4
1 files changed, 2 insertions, 2 deletions
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