commit f2ccd8fa06c8e302116e71df372f5c1f83432e03
author David S. Miller <davem@davemloft.net> Tue Aug 09 19:34:12 2005 -0700
committer David S. Miller <davem@sunset.davemloft.net> Mon Aug 29 15:32:25 2005 -0700
tree 6e933f4bdc8899009edb33642b908779f123fb4a
parent b6b99eb5409d75ae35390057cd28f3aedfbd4cf4

[NET]: Kill skb->real_dev

Bonding just wants the device before the skb_bond()
decapsulation occurs, so simply pass that original
device into packet_type->func() as an argument.

It remains to be seen whether we can use this same
exact thing to get rid of skb->input_dev as well.

Signed-off-by: David S. Miller <davem@davemloft.net>

net/ipv4/ip_input.c

diff --git a/net/ipv4/ip_input.c b/net/ipv4/ip_input.c
index c703528e..d603247 100644
--- a/net/ipv4/ip_input.c
+++ b/net/ipv4/ip_input.c
@@ -358,7 +358,7 @@
 /*
  * 	Main IP Receive routine.
  */ 
-int ip_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt)
+int ip_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt, struct net_device *orig_dev)
 {
 	struct iphdr *iph;