From af8df3dc8dbf0ac676b959e86edcbb1194cc2ad5 Mon Sep 17 00:00:00 2001 From: Pavel Emelyanov Date: Fri, 9 Dec 2011 06:23:34 +0000 Subject: [PATCH] --- yaml --- r: 278548 b: refs/heads/master c: fce823381e3c082ba1b2e15d5151d1aa8afdc9e9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/net/udp.h | 6 ++++++ trunk/net/ipv4/udp.c | 3 ++- trunk/net/ipv6/udp.c | 3 ++- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index be746b7adeb5..eda14e591023 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1942c518ca017f376b267a7c5e78c15d37202442 +refs/heads/master: fce823381e3c082ba1b2e15d5151d1aa8afdc9e9 diff --git a/trunk/include/net/udp.h b/trunk/include/net/udp.h index f54a5156b248..1ffb39c9f324 100644 --- a/trunk/include/net/udp.h +++ b/trunk/include/net/udp.h @@ -194,9 +194,15 @@ 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 *__udp4_lib_lookup(struct net *net, __be32 saddr, __be16 sport, + __be32 daddr, __be16 dport, + int dif, struct udp_table *tbl); 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); +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, struct udp_table *tbl); /* * SNMP statistics for UDP and UDP-Lite diff --git a/trunk/net/ipv4/udp.c b/trunk/net/ipv4/udp.c index ad481b32f1e3..5d075b5f70fc 100644 --- a/trunk/net/ipv4/udp.c +++ b/trunk/net/ipv4/udp.c @@ -445,7 +445,7 @@ static struct sock *udp4_lib_lookup2(struct net *net, /* UDP is nearly always wildcards out the wazoo, it makes no sense to try * harder than this. -DaveM */ -static struct sock *__udp4_lib_lookup(struct net *net, __be32 saddr, +struct sock *__udp4_lib_lookup(struct net *net, __be32 saddr, __be16 sport, __be32 daddr, __be16 dport, int dif, struct udp_table *udptable) { @@ -512,6 +512,7 @@ static struct sock *__udp4_lib_lookup(struct net *net, __be32 saddr, rcu_read_unlock(); return result; } +EXPORT_SYMBOL_GPL(__udp4_lib_lookup); static inline struct sock *__udp4_lib_lookup_skb(struct sk_buff *skb, __be16 sport, __be16 dport, diff --git a/trunk/net/ipv6/udp.c b/trunk/net/ipv6/udp.c index adfe26a7fc63..4f96b5c63685 100644 --- a/trunk/net/ipv6/udp.c +++ b/trunk/net/ipv6/udp.c @@ -238,7 +238,7 @@ static struct sock *udp6_lib_lookup2(struct net *net, return result; } -static struct sock *__udp6_lib_lookup(struct net *net, +struct sock *__udp6_lib_lookup(struct net *net, const struct in6_addr *saddr, __be16 sport, const struct in6_addr *daddr, __be16 dport, int dif, struct udp_table *udptable) @@ -305,6 +305,7 @@ static struct sock *__udp6_lib_lookup(struct net *net, rcu_read_unlock(); return result; } +EXPORT_SYMBOL_GPL(__udp6_lib_lookup); static struct sock *__udp6_lib_lookup_skb(struct sk_buff *skb, __be16 sport, __be16 dport,