diff options
author | Denis V. Lunev <den@openvz.org> | 2008-04-03 17:20:52 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-04-03 17:20:52 -0400 |
commit | 7630f026810a63464e47391ab1e03674c33eb1b8 (patch) | |
tree | 05ff3b2f6a750e659de4484c4b825953ecce1659 /net/dccp/output.c | |
parent | 14c0c8e8e0fb85e7a57e88606c009377746b39d9 (diff) |
[DCCP]: Replace socket with sock for reset sending.
Replace dccp_v(4|6)_ctl_socket with sock to unify a code with TCP/ICMP.
Signed-off-by: Denis V. Lunev <den@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/output.c')
-rw-r--r-- | net/dccp/output.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/dccp/output.c b/net/dccp/output.c index 3b763db3d863..f32a84ef757b 100644 --- a/net/dccp/output.c +++ b/net/dccp/output.c | |||
@@ -348,7 +348,7 @@ struct sk_buff *dccp_make_response(struct sock *sk, struct dst_entry *dst, | |||
348 | EXPORT_SYMBOL_GPL(dccp_make_response); | 348 | EXPORT_SYMBOL_GPL(dccp_make_response); |
349 | 349 | ||
350 | /* answer offending packet in @rcv_skb with Reset from control socket @ctl */ | 350 | /* answer offending packet in @rcv_skb with Reset from control socket @ctl */ |
351 | struct sk_buff *dccp_ctl_make_reset(struct socket *ctl, struct sk_buff *rcv_skb) | 351 | struct sk_buff *dccp_ctl_make_reset(struct sock *sk, struct sk_buff *rcv_skb) |
352 | { | 352 | { |
353 | struct dccp_hdr *rxdh = dccp_hdr(rcv_skb), *dh; | 353 | struct dccp_hdr *rxdh = dccp_hdr(rcv_skb), *dh; |
354 | struct dccp_skb_cb *dcb = DCCP_SKB_CB(rcv_skb); | 354 | struct dccp_skb_cb *dcb = DCCP_SKB_CB(rcv_skb); |
@@ -358,11 +358,11 @@ struct sk_buff *dccp_ctl_make_reset(struct socket *ctl, struct sk_buff *rcv_skb) | |||
358 | struct dccp_hdr_reset *dhr; | 358 | struct dccp_hdr_reset *dhr; |
359 | struct sk_buff *skb; | 359 | struct sk_buff *skb; |
360 | 360 | ||
361 | skb = alloc_skb(ctl->sk->sk_prot->max_header, GFP_ATOMIC); | 361 | skb = alloc_skb(sk->sk_prot->max_header, GFP_ATOMIC); |
362 | if (skb == NULL) | 362 | if (skb == NULL) |
363 | return NULL; | 363 | return NULL; |
364 | 364 | ||
365 | skb_reserve(skb, ctl->sk->sk_prot->max_header); | 365 | skb_reserve(skb, sk->sk_prot->max_header); |
366 | 366 | ||
367 | /* Swap the send and the receive. */ | 367 | /* Swap the send and the receive. */ |
368 | dh = dccp_zeroed_hdr(skb, dccp_hdr_reset_len); | 368 | dh = dccp_zeroed_hdr(skb, dccp_hdr_reset_len); |