diff options
author | Eric Dumazet <eric.dumazet@gmail.com> | 2009-11-20 18:35:04 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-11-20 18:35:04 -0500 |
commit | 8964be4a9a5ca8cab1219bb046db2f6d1936227c (patch) | |
tree | 8838c73a03cc69c010b55928fce3725d17bc26a9 /include | |
parent | fa9a6fed87df1b50804405e700f8d30251d3aaf1 (diff) |
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')
-rw-r--r-- | include/linux/skbuff.h | 4 | ||||
-rw-r--r-- | include/net/pkt_cls.h | 4 |
2 files changed, 4 insertions, 4 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; | |||
299 | * @nfctinfo: Relationship of this skb to the connection | 299 | * @nfctinfo: Relationship of this skb to the connection |
300 | * @nfct_reasm: netfilter conntrack re-assembly pointer | 300 | * @nfct_reasm: netfilter conntrack re-assembly pointer |
301 | * @nf_bridge: Saved data about a bridged frame - see br_netfilter.c | 301 | * @nf_bridge: Saved data about a bridged frame - see br_netfilter.c |
302 | * @iif: ifindex of device we arrived on | 302 | * @skb_iif: ifindex of device we arrived on |
303 | * @queue_mapping: Queue mapping for multiqueue devices | 303 | * @queue_mapping: Queue mapping for multiqueue devices |
304 | * @tc_index: Traffic control index | 304 | * @tc_index: Traffic control index |
305 | * @tc_verd: traffic control verdict | 305 | * @tc_verd: traffic control verdict |
@@ -366,7 +366,7 @@ struct sk_buff { | |||
366 | struct nf_bridge_info *nf_bridge; | 366 | struct nf_bridge_info *nf_bridge; |
367 | #endif | 367 | #endif |
368 | 368 | ||
369 | int iif; | 369 | int skb_iif; |
370 | #ifdef CONFIG_NET_SCHED | 370 | #ifdef CONFIG_NET_SCHED |
371 | __u16 tc_index; /* traffic control index */ | 371 | __u16 tc_index; /* traffic control index */ |
372 | #ifdef CONFIG_NET_CLS_ACT | 372 | #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) | |||
343 | struct net_device *dev; | 343 | struct net_device *dev; |
344 | 344 | ||
345 | if (indev[0]) { | 345 | if (indev[0]) { |
346 | if (!skb->iif) | 346 | if (!skb->skb_iif) |
347 | return 0; | 347 | return 0; |
348 | dev = __dev_get_by_index(dev_net(skb->dev), skb->iif); | 348 | dev = __dev_get_by_index(dev_net(skb->dev), skb->skb_iif); |
349 | if (!dev || strcmp(indev, dev->name)) | 349 | if (!dev || strcmp(indev, dev->name)) |
350 | return 0; | 350 | return 0; |
351 | } | 351 | } |