aboutsummaryrefslogtreecommitdiffstats
path: root/net/dccp
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@mandriva.com>2006-03-21 00:23:59 -0500
committerDavid S. Miller <davem@davemloft.net>2006-03-21 00:23:59 -0500
commit0a1ec676ddbee712e1c1da679be4bdc529caf215 (patch)
tree709db39592784baebb9f43f5d1bbd33c70fdcbeb /net/dccp
parentc985ed705ffc682ce40d46a5f7bf98db86b27899 (diff)
[DCCP]: Dont use dccp_v4_checksum in dccp_make_response
dccp_make_response is shared by ipv4/6 and the ipv6 code was recalculating the checksum, not good, so move the dccp_v4_checksum call to dccp_v4_send_response. Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dccp')
-rw-r--r--net/dccp/ipv4.c3
-rw-r--r--net/dccp/output.c3
2 files changed, 3 insertions, 3 deletions
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
index 34d1b119b720..f087593d64d3 100644
--- a/net/dccp/ipv4.c
+++ b/net/dccp/ipv4.c
@@ -264,7 +264,10 @@ static int dccp_v4_send_response(struct sock *sk, struct request_sock *req,
264 skb = dccp_make_response(sk, dst, req); 264 skb = dccp_make_response(sk, dst, req);
265 if (skb != NULL) { 265 if (skb != NULL) {
266 const struct inet_request_sock *ireq = inet_rsk(req); 266 const struct inet_request_sock *ireq = inet_rsk(req);
267 struct dccp_hdr *dh = dccp_hdr(skb);
267 268
269 dh->dccph_checksum = dccp_v4_checksum(skb, ireq->loc_addr,
270 ireq->rmt_addr);
268 memset(&(IPCB(skb)->opt), 0, sizeof(IPCB(skb)->opt)); 271 memset(&(IPCB(skb)->opt), 0, sizeof(IPCB(skb)->opt));
269 err = ip_build_and_send_pkt(skb, sk, ireq->loc_addr, 272 err = ip_build_and_send_pkt(skb, sk, ireq->loc_addr,
270 ireq->rmt_addr, 273 ireq->rmt_addr,
diff --git a/net/dccp/output.c b/net/dccp/output.c
index 9922d2696b9c..6bd21e37686e 100644
--- a/net/dccp/output.c
+++ b/net/dccp/output.c
@@ -314,9 +314,6 @@ struct sk_buff *dccp_make_response(struct sock *sk, struct dst_entry *dst,
314 dccp_hdr_set_ack(dccp_hdr_ack_bits(skb), dreq->dreq_isr); 314 dccp_hdr_set_ack(dccp_hdr_ack_bits(skb), dreq->dreq_isr);
315 dccp_hdr_response(skb)->dccph_resp_service = dreq->dreq_service; 315 dccp_hdr_response(skb)->dccph_resp_service = dreq->dreq_service;
316 316
317 dh->dccph_checksum = dccp_v4_checksum(skb, inet_rsk(req)->loc_addr,
318 inet_rsk(req)->rmt_addr);
319
320 DCCP_INC_STATS(DCCP_MIB_OUTSEGS); 317 DCCP_INC_STATS(DCCP_MIB_OUTSEGS);
321 return skb; 318 return skb;
322} 319}