aboutsummaryrefslogtreecommitdiffstats
path: root/net/dccp
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@openvz.org>2008-04-13 22:30:19 -0700
committerDavid S. Miller <davem@davemloft.net>2008-04-13 22:30:19 -0700
commitf54873982c6aac9bc5c7eef62a9ce4d52b1dfc19 (patch)
treedf285d76f0ada79cd588f607a276757b2a4630ec /net/dccp
parentb76c4b27fee9c88294d3152784291fc6f6d23401 (diff)
downloadkernel_samsung_crespo-f54873982c6aac9bc5c7eef62a9ce4d52b1dfc19.zip
kernel_samsung_crespo-f54873982c6aac9bc5c7eef62a9ce4d52b1dfc19.tar.gz
kernel_samsung_crespo-f54873982c6aac9bc5c7eef62a9ce4d52b1dfc19.tar.bz2
[NETNS][DCCPV4]: Use proper net to route the reset packet.
The dccp_v4_route_skb used in dccp_v4_ctl_send_reset, currently works with init_net's routing tables - fix it. 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>
Diffstat (limited to 'net/dccp')
-rw-r--r--net/dccp/ipv4.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
index cad62d8..11d0b85 100644
--- a/net/dccp/ipv4.c
+++ b/net/dccp/ipv4.c
@@ -445,7 +445,7 @@ static struct sock *dccp_v4_hnd_req(struct sock *sk, struct sk_buff *skb)
return sk;
}
-static struct dst_entry* dccp_v4_route_skb(struct sock *sk,
+static struct dst_entry* dccp_v4_route_skb(struct net *net, struct sock *sk,
struct sk_buff *skb)
{
struct rtable *rt;
@@ -462,7 +462,7 @@ static struct dst_entry* dccp_v4_route_skb(struct sock *sk,
};
security_skb_classify_flow(skb, &fl);
- if (ip_route_output_flow(&init_net, &rt, &fl, sk, 0)) {
+ if (ip_route_output_flow(net, &rt, &fl, sk, 0)) {
IP_INC_STATS_BH(IPSTATS_MIB_OUTNOROUTES);
return NULL;
}
@@ -515,7 +515,7 @@ static void dccp_v4_ctl_send_reset(struct sock *sk, struct sk_buff *rxskb)
if (rxskb->rtable->rt_type != RTN_LOCAL)
return;
- dst = dccp_v4_route_skb(ctl_sk, rxskb);
+ dst = dccp_v4_route_skb(net, ctl_sk, rxskb);
if (dst == NULL)
return;