aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorEric Dumazet <eric.dumazet@gmail.com>2009-11-20 18:35:04 -0500
committerDavid S. Miller <davem@davemloft.net>2009-11-20 18:35:04 -0500
commit8964be4a9a5ca8cab1219bb046db2f6d1936227c (patch)
tree8838c73a03cc69c010b55928fce3725d17bc26a9 /drivers
parentfa9a6fed87df1b50804405e700f8d30251d3aaf1 (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 'drivers')
-rw-r--r--drivers/ieee802154/fakehard.c2
-rw-r--r--drivers/net/ifb.c6
2 files changed, 4 insertions, 4 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)
282static netdev_tx_t ieee802154_fake_xmit(struct sk_buff *skb, 282static netdev_tx_t ieee802154_fake_xmit(struct sk_buff *skb,
283 struct net_device *dev) 283 struct net_device *dev)
284{ 284{
285 skb->iif = dev->ifindex; 285 skb->skb_iif = dev->ifindex;
286 skb->dev = dev; 286 skb->dev = dev;
287 dev->stats.tx_packets++; 287 dev->stats.tx_packets++;
288 dev->stats.tx_bytes += skb->len; 288 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)
99 stats->tx_bytes +=skb->len; 99 stats->tx_bytes +=skb->len;
100 100
101 rcu_read_lock(); 101 rcu_read_lock();
102 skb->dev = dev_get_by_index_rcu(&init_net, skb->iif); 102 skb->dev = dev_get_by_index_rcu(&init_net, skb->skb_iif);
103 if (!skb->dev) { 103 if (!skb->dev) {
104 rcu_read_unlock(); 104 rcu_read_unlock();
105 dev_kfree_skb(skb); 105 dev_kfree_skb(skb);
@@ -107,7 +107,7 @@ static void ri_tasklet(unsigned long dev)
107 break; 107 break;
108 } 108 }
109 rcu_read_unlock(); 109 rcu_read_unlock();
110 skb->iif = _dev->ifindex; 110 skb->skb_iif = _dev->ifindex;
111 111
112 if (from & AT_EGRESS) { 112 if (from & AT_EGRESS) {
113 dp->st_rx_frm_egr++; 113 dp->st_rx_frm_egr++;
@@ -172,7 +172,7 @@ static netdev_tx_t ifb_xmit(struct sk_buff *skb, struct net_device *dev)
172 stats->rx_packets++; 172 stats->rx_packets++;
173 stats->rx_bytes+=skb->len; 173 stats->rx_bytes+=skb->len;
174 174
175 if (!(from & (AT_INGRESS|AT_EGRESS)) || !skb->iif) { 175 if (!(from & (AT_INGRESS|AT_EGRESS)) || !skb->skb_iif) {
176 dev_kfree_skb(skb); 176 dev_kfree_skb(skb);
177 stats->rx_dropped++; 177 stats->rx_dropped++;
178 return NETDEV_TX_OK; 178 return NETDEV_TX_OK;