From 31386458847a29681d374b11d4507e0709eb20eb Mon Sep 17 00:00:00 2001
From: Balazs Scheidler <bazsi@balabit.hu>
Date: Thu, 21 Oct 2010 16:05:41 +0200
Subject: [PATCH] --- yaml --- r: 215491 b: refs/heads/master c:
 aa976fc011efa1f0e3290c6c9addf7c20757f885 h: refs/heads/master i:   215489:
 34e9067bcbd1c93f736a2106305766aa8bc2be1c   215487:
 c262e7969af9a269bd6c488bdee5c54dc1154470 v: v3

---
 [refs]                  | 2 +-
 trunk/include/net/udp.h | 3 +++
 trunk/net/ipv6/udp.c    | 8 ++++++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 380342edc75e..6789f679a190 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 88440ae70eda83d0cc94148d404f4990c9f1289c
+refs/heads/master: aa976fc011efa1f0e3290c6c9addf7c20757f885
diff --git a/trunk/include/net/udp.h b/trunk/include/net/udp.h
index a184d3496b13..200b82848c9a 100644
--- a/trunk/include/net/udp.h
+++ b/trunk/include/net/udp.h
@@ -183,6 +183,9 @@ extern int udp_lib_setsockopt(struct sock *sk, int level, int optname,
 extern struct sock *udp4_lib_lookup(struct net *net, __be32 saddr, __be16 sport,
 				    __be32 daddr, __be16 dport,
 				    int dif);
+extern struct sock *udp6_lib_lookup(struct net *net, const struct in6_addr *saddr, __be16 sport,
+				    const struct in6_addr *daddr, __be16 dport,
+				    int dif);
 
 /*
  * 	SNMP statistics for UDP and UDP-Lite
diff --git a/trunk/net/ipv6/udp.c b/trunk/net/ipv6/udp.c
index 33e368318d47..c84dad432114 100644
--- a/trunk/net/ipv6/udp.c
+++ b/trunk/net/ipv6/udp.c
@@ -320,6 +320,14 @@ static struct sock *__udp6_lib_lookup_skb(struct sk_buff *skb,
 				 udptable);
 }
 
+struct sock *udp6_lib_lookup(struct net *net, const struct in6_addr *saddr, __be16 sport,
+			     const struct in6_addr *daddr, __be16 dport, int dif)
+{
+	return __udp6_lib_lookup(net, saddr, sport, daddr, dport, dif, &udp_table);
+}
+EXPORT_SYMBOL_GPL(udp6_lib_lookup);
+
+
 /*
  * 	This should be easy, if there is something there we
  * 	return it, otherwise we block.