2 files changed, 7 insertions, 11 deletions

diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
index 2312b9f4d7af..44f6e17e105f 100644
--- a/net/dccp/ipv4.c
+++ b/net/dccp/ipv4.c
@@ -568,17 +568,14 @@ int dccp_v4_conn_request(struct sock *sk, struct sk_buff *skb)
         struct dccp_request_sock *dreq;
         const __be32 service = dccp_hdr_request(skb)->dccph_req_service;
         struct dccp_skb_cb *dcb = DCCP_SKB_CB(skb);
-        __u8 reset_code = DCCP_RESET_CODE_TOO_BUSY;
 
         /* Never answer to DCCP_PKT_REQUESTs send to broadcast or multicast */
         if (((struct rtable *)skb->dst)->rt_flags &
-            (RTCF_BROADCAST | RTCF_MULTICAST)) {
-                reset_code = DCCP_RESET_CODE_NO_CONNECTION;
-                goto drop;
-        }
+            (RTCF_BROADCAST | RTCF_MULTICAST))
+                return 0;       /* discard, don't send a reset here */
 
         if (dccp_bad_service_code(sk, service)) {
-                reset_code = DCCP_RESET_CODE_BAD_SERVICE_CODE;
+                dcb->dccpd_reset_code = DCCP_RESET_CODE_BAD_SERVICE_CODE;
                 goto drop;
         }
         /*
@@ -586,6 +583,7 @@ int dccp_v4_conn_request(struct sock *sk, struct sk_buff *skb)
          * limitations, they conserve resources and peer is
          * evidently real one.
          */
+        dcb->dccpd_reset_code = DCCP_RESET_CODE_TOO_BUSY;
         if (inet_csk_reqsk_queue_is_full(sk))
                 goto drop;
 
@@ -638,7 +636,6 @@ drop_and_free:
         reqsk_free(req);
 drop:
         DCCP_INC_STATS_BH(DCCP_MIB_ATTEMPTFAILS);
-        dcb->dccpd_reset_code = reset_code;
         return -1;
 }
 
diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c
index b7c0f66e2834..006a3834fbcd 100644
--- a/net/dccp/ipv6.c
+++ b/net/dccp/ipv6.c
@@ -390,21 +390,21 @@ static int dccp_v6_conn_request(struct sock *sk, struct sk_buff *skb)
         struct ipv6_pinfo *np = inet6_sk(sk);
         const __be32 service = dccp_hdr_request(skb)->dccph_req_service;
         struct dccp_skb_cb *dcb = DCCP_SKB_CB(skb);
-        __u8 reset_code = DCCP_RESET_CODE_TOO_BUSY;
 
         if (skb->protocol == htons(ETH_P_IP))
                 return dccp_v4_conn_request(sk, skb);
 
         if (!ipv6_unicast_destination(skb))
-                goto drop;
+                return 0;       /* discard, don't send a reset here */
 
         if (dccp_bad_service_code(sk, service)) {
-                reset_code = DCCP_RESET_CODE_BAD_SERVICE_CODE;
+                dcb->dccpd_reset_code = DCCP_RESET_CODE_BAD_SERVICE_CODE;
                 goto drop;
         }
         /*
          * There are no SYN attacks on IPv6, yet...
          */
+        dcb->dccpd_reset_code = DCCP_RESET_CODE_TOO_BUSY;
         if (inet_csk_reqsk_queue_is_full(sk))
                 goto drop;
 
@@ -464,7 +464,6 @@ drop_and_free:
         reqsk_free(req);
 drop:
         DCCP_INC_STATS_BH(DCCP_MIB_ATTEMPTFAILS);
-        dcb->dccpd_reset_code = reset_code;
         return -1;
 }