X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=include%2Flinux%2Fskbuff.h;h=89eed8cdd318cd1597d330c888973a3c423de16a;hb=8964be4a9a5ca8cab1219bb046db2f6d1936227c;hp=63f47426977a74ead5ea7d8231ecf99c36307796;hpb=fa9a6fed87df1b50804405e700f8d30251d3aaf1;p=deliverable%2Flinux.git

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