summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorKOVACS Krisztian <hidden@sch.bme.hu>2008-10-07 19:41:01 (GMT)
committerDavid S. Miller <davem@davemloft.net>2008-10-07 19:41:01 (GMT)
commit23542618deb77cfed312842fe8c41ed19fb16470 (patch)
tree9658279a6e3593846a9127c7a8bffb7ce0077d62 /net
parent607c4aaf03041c8bd81555a0218050c0f895088e (diff)
downloadlinux-fsl-qoriq-23542618deb77cfed312842fe8c41ed19fb16470.tar.xz
inet: Don't lookup the socket if there's a socket attached to the skb
Use the socket cached in the skb if it's present. Signed-off-by: KOVACS Krisztian <hidden@sch.bme.hu> Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/udp.c10
-rw-r--r--net/ipv6/udp.c10
2 files changed, 14 insertions, 6 deletions
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index c7a90b5..822c9de 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -306,11 +306,15 @@ static inline struct sock *__udp4_lib_lookup_skb(struct sk_buff *skb,
__be16 sport, __be16 dport,
struct hlist_head udptable[])
{
+ struct sock *sk;
const struct iphdr *iph = ip_hdr(skb);
- return __udp4_lib_lookup(dev_net(skb->dst->dev), iph->saddr, sport,
- iph->daddr, dport, inet_iif(skb),
- udptable);
+ if (unlikely(sk = skb_steal_sock(skb)))
+ return sk;
+ else
+ return __udp4_lib_lookup(dev_net(skb->dst->dev), iph->saddr, sport,
+ iph->daddr, dport, inet_iif(skb),
+ udptable);
}
struct sock *udp4_lib_lookup(struct net *net, __be32 saddr, __be16 sport,
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index ce26c41..e51da8c 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -111,11 +111,15 @@ static struct sock *__udp6_lib_lookup_skb(struct sk_buff *skb,
__be16 sport, __be16 dport,
struct hlist_head udptable[])
{
+ struct sock *sk;
struct ipv6hdr *iph = ipv6_hdr(skb);
- return __udp6_lib_lookup(dev_net(skb->dst->dev), &iph->saddr, sport,
- &iph->daddr, dport, inet6_iif(skb),
- udptable);
+ if (unlikely(sk = skb_steal_sock(skb)))
+ return sk;
+ else
+ return __udp6_lib_lookup(dev_net(skb->dst->dev), &iph->saddr, sport,
+ &iph->daddr, dport, inet6_iif(skb),
+ udptable);
}
/*