Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw

[~andy/linux] / net / core / dev.c

diff --git a/net/core/dev.c b/net/core/dev.c
index cca02ae7a844ffa5d9bb3897dd1e2998a41ca653..0ebaea16632fc348f6a48789831b737c7c51b707 100644 (file)
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3173,8 +3173,6 @@ static int __netif_receive_skb(struct sk_buff *skb)
        if (netpoll_receive_skb(skb))
                return NET_RX_DROP;
 
-       if (!skb->skb_iif)
-               skb->skb_iif = skb->dev->ifindex;
        orig_dev = skb->dev;
 
        skb_reset_network_header(skb);
@@ -3186,6 +3184,7 @@ static int __netif_receive_skb(struct sk_buff *skb)
        rcu_read_lock();
 
 another_round:
+       skb->skb_iif = skb->dev->ifindex;
 
        __this_cpu_inc(softnet_data.processed);