diff options
| author | David S. Miller | 2005-08-10 04:34:12 +0200 |
|---|---|---|
| committer | David S. Miller | 2005-08-30 00:32:25 +0200 |
| commit | f2ccd8fa06c8e302116e71df372f5c1f83432e03 (patch) | |
| tree | 6e933f4bdc8899009edb33642b908779f123fb4a /net/ipv6 | |
| parent | [NET]: Reduce tc_index/tc_verd to u16 (diff) | |
| download | kernel-qcow2-linux-f2ccd8fa06c8e302116e71df372f5c1f83432e03.tar.gz kernel-qcow2-linux-f2ccd8fa06c8e302116e71df372f5c1f83432e03.tar.xz kernel-qcow2-linux-f2ccd8fa06c8e302116e71df372f5c1f83432e03.zip | |
[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>
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/ip6_input.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/ip6_input.c b/net/ipv6/ip6_input.c index 10fbb50daea4..ab51c0369e15 100644 --- a/net/ipv6/ip6_input.c +++ b/net/ipv6/ip6_input.c @@ -56,7 +56,7 @@ static inline int ip6_rcv_finish( struct sk_buff *skb) return dst_input(skb); } -int ipv6_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt) +int ipv6_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt, struct net_device *orig_dev) { struct ipv6hdr *hdr; u32 pkt_len; |