aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-07-23 16:27:54 -0700
committerDavid S. Miller <davem@davemloft.net>2012-07-23 16:36:27 -0700
commitb68581778cd0051a3fb9a2b614dee7eccb5127ff (patch)
treefadc77a8c3f1b0a77e05a69fad951f83ead67d43
parentipv4: Prepare for change of rt->rt_iif encoding. (diff)
downloadlinux-dev-b68581778cd0051a3fb9a2b614dee7eccb5127ff.tar.xz
linux-dev-b68581778cd0051a3fb9a2b614dee7eccb5127ff.zip
net: Make skb->skb_iif always track skb->dev
Make it follow device decapsulation, from things such as VLAN and bonding. The stuff that actually cares about pre-demuxed device pointers, is handled by the "orig_dev" variable in __netif_receive_skb(). And the only consumer of that is the po->origdev feature of AF_PACKET sockets. Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/core/dev.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index cca02ae7a844..0ebaea16632f 100644
--- 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);