Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

[linux-2.6-omap-h63xx.git] / include / net / ipv6.h

diff --git a/include/net/ipv6.h b/include/net/ipv6.h
index 860bbac4c4ee37dd0d3431c120f9ddf5a8fd3746..3b1d963d396caacb46c5be018aac0a89ea82d4a2 100644 (file)
--- a/include/net/ipv6.h
+++ b/include/net/ipv6.h
@@ -418,6 +418,8 @@ extern int                  ipv6_rcv(struct sk_buff *skb,
                                         struct packet_type *pt,
                                         struct net_device *orig_dev);
 
+extern int                     ip6_rcv_finish(struct sk_buff *skb);
+
 /*
  *     upper-layer output functions
  */