From 836884bac9653e5b5b12b196acf7a25d1fbbd669 Mon Sep 17 00:00:00 2001 From: Arnaldo Carvalho de Melo Date: Mon, 20 Mar 2006 21:23:59 -0800 Subject: [PATCH] --- yaml --- r: 22210 b: refs/heads/master c: 0a1ec676ddbee712e1c1da679be4bdc529caf215 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/dccp/ipv4.c | 3 +++ trunk/net/dccp/output.c | 3 --- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 317a756cc527..5e67fdb8ec6c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c985ed705ffc682ce40d46a5f7bf98db86b27899 +refs/heads/master: 0a1ec676ddbee712e1c1da679be4bdc529caf215 diff --git a/trunk/net/dccp/ipv4.c b/trunk/net/dccp/ipv4.c index 34d1b119b720..f087593d64d3 100644 --- a/trunk/net/dccp/ipv4.c +++ b/trunk/net/dccp/ipv4.c @@ -264,7 +264,10 @@ static int dccp_v4_send_response(struct sock *sk, struct request_sock *req, skb = dccp_make_response(sk, dst, req); if (skb != NULL) { const struct inet_request_sock *ireq = inet_rsk(req); + struct dccp_hdr *dh = dccp_hdr(skb); + dh->dccph_checksum = dccp_v4_checksum(skb, ireq->loc_addr, + ireq->rmt_addr); memset(&(IPCB(skb)->opt), 0, sizeof(IPCB(skb)->opt)); err = ip_build_and_send_pkt(skb, sk, ireq->loc_addr, ireq->rmt_addr, diff --git a/trunk/net/dccp/output.c b/trunk/net/dccp/output.c index 9922d2696b9c..6bd21e37686e 100644 --- a/trunk/net/dccp/output.c +++ b/trunk/net/dccp/output.c @@ -314,9 +314,6 @@ struct sk_buff *dccp_make_response(struct sock *sk, struct dst_entry *dst, dccp_hdr_set_ack(dccp_hdr_ack_bits(skb), dreq->dreq_isr); dccp_hdr_response(skb)->dccph_resp_service = dreq->dreq_service; - dh->dccph_checksum = dccp_v4_checksum(skb, inet_rsk(req)->loc_addr, - inet_rsk(req)->rmt_addr); - DCCP_INC_STATS(DCCP_MIB_OUTSEGS); return skb; }