[DCCP]: Generalize dccp_v4_send_reset

Renaming it to dccp_send_reset and moving it from the ipv4 specific
code to the core dccp code.

This fixes some bugs in IPV6 where timers would send v4 resets, etc.

Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 25 insertions, 5 deletions

diff --git a/net/dccp/output.c b/net/dccp/output.c
index 0cc2bcf56522..9922d2696b9c 100644
--- a/net/dccp/output.c
+++ b/net/dccp/output.c
@@ -323,8 +323,8 @@ struct sk_buff *dccp_make_response(struct sock *sk, struct dst_entry *dst,
 
 EXPORT_SYMBOL_GPL(dccp_make_response);
 
-struct sk_buff *dccp_make_reset(struct sock *sk, struct dst_entry *dst,
-                                const enum dccp_reset_codes code)
+static struct sk_buff *dccp_make_reset(struct sock *sk, struct dst_entry *dst,
+                                       const enum dccp_reset_codes code)
                                    
 {
         struct dccp_hdr *dh;
@@ -366,14 +366,34 @@ struct sk_buff *dccp_make_reset(struct sock *sk, struct dst_entry *dst,
         dccp_hdr_set_ack(dccp_hdr_ack_bits(skb), dp->dccps_gsr);
 
         dccp_hdr_reset(skb)->dccph_reset_code = code;
-
-        dh->dccph_checksum = dccp_v4_checksum(skb, inet_sk(sk)->saddr,
-                                              inet_sk(sk)->daddr);
+        inet_csk(sk)->icsk_af_ops->send_check(sk, skb->len, skb);
 
         DCCP_INC_STATS(DCCP_MIB_OUTSEGS);
         return skb;
 }
 
+int dccp_send_reset(struct sock *sk, enum dccp_reset_codes code)
+{
+        /*
+         * FIXME: what if rebuild_header fails?
+         * Should we be doing a rebuild_header here?
+         */
+        int err = inet_sk_rebuild_header(sk);
+
+        if (err == 0) {
+                struct sk_buff *skb = dccp_make_reset(sk, sk->sk_dst_cache,
+                                                      code);
+                if (skb != NULL) {
+                        memset(&(IPCB(skb)->opt), 0, sizeof(IPCB(skb)->opt));
+                        err = inet_csk(sk)->icsk_af_ops->queue_xmit(skb, 0);
+                        if (err == NET_XMIT_CN)
+                                err = 0;
+                }
+        }
+
+        return err;
+}
+
 /*
  * Do all connect socket setups that can be done AF independent.
  */