git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net: rename skb->iif to skb->skb_iif
[safe/jmp/linux-2.6]
/
drivers
/
net
/
ifb.c
diff --git
a/drivers/net/ifb.c
b/drivers/net/ifb.c
index
69c2566
..
f4081c0
100644
(file)
--- 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();
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);
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();
break;
}
rcu_read_unlock();
- skb->iif = _dev->ifindex;
+ skb->
skb_
iif = _dev->ifindex;
if (from & AT_EGRESS) {
dp->st_rx_frm_egr++;
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;
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;
dev_kfree_skb(skb);
stats->rx_dropped++;
return NETDEV_TX_OK;