diff options
| author | Pavel Emelyanov <xemul@openvz.org> | 2008-04-13 22:30:43 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-13 22:30:43 -0700 |
| commit | b9901a84c98fe27c6a598c0f3ec944a7f17a5f97 (patch) | |
| tree | 42e43b306154705ee17ccb350914e486308040ca | |
| parent | f54873982c6aac9bc5c7eef62a9ce4d52b1dfc19 (diff) | |
| download | linux-3.10-b9901a84c98fe27c6a598c0f3ec944a7f17a5f97.tar.gz linux-3.10-b9901a84c98fe27c6a598c0f3ec944a7f17a5f97.tar.bz2 linux-3.10-b9901a84c98fe27c6a598c0f3ec944a7f17a5f97.zip | |
[NETNS][DCCPV4]: Make per-net socket lookup.
The inet_lookup family of functions requires a net to lookup
a socket in, so give a proper one to them.
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/dccp/ipv4.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c index 11d0b8589aa..66f860b1b91 100644 --- a/net/dccp/ipv4.c +++ b/net/dccp/ipv4.c @@ -211,8 +211,9 @@ static void dccp_v4_err(struct sk_buff *skb, u32 info) return; } - sk = inet_lookup(&init_net, &dccp_hashinfo, iph->daddr, dh->dccph_dport, - iph->saddr, dh->dccph_sport, inet_iif(skb)); + sk = inet_lookup(dev_net(skb->dev), &dccp_hashinfo, + iph->daddr, dh->dccph_dport, + iph->saddr, dh->dccph_sport, inet_iif(skb)); if (sk == NULL) { ICMP_INC_STATS_BH(ICMP_MIB_INERRORS); return; @@ -429,7 +430,7 @@ static struct sock *dccp_v4_hnd_req(struct sock *sk, struct sk_buff *skb) if (req != NULL) return dccp_check_req(sk, skb, req, prev); - nsk = inet_lookup_established(&init_net, &dccp_hashinfo, + nsk = inet_lookup_established(sock_net(sk), &dccp_hashinfo, iph->saddr, dh->dccph_sport, iph->daddr, dh->dccph_dport, inet_iif(skb)); @@ -810,7 +811,7 @@ static int dccp_v4_rcv(struct sk_buff *skb) /* Step 2: * Look up flow ID in table and get corresponding socket */ - sk = __inet_lookup(&init_net, &dccp_hashinfo, + sk = __inet_lookup(dev_net(skb->dst->dev), &dccp_hashinfo, iph->saddr, dh->dccph_sport, iph->daddr, dh->dccph_dport, inet_iif(skb)); /* |