[IPV6]: Remove unused code in ndisc_send_redirect().

[linux-2.6] / net / dccp / ipv6.c

diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c
index 490333d47c7b04dda8a6660cab945988626a86ce..2fec1af1a8c39e6e1e70472f2633d41f8dae6d68 100644 (file)
--- a/net/dccp/ipv6.c
+++ b/net/dccp/ipv6.c
@@ -224,8 +224,7 @@ out:
 }
 
 
-static int dccp_v6_send_response(struct sock *sk, struct request_sock *req,
-                                struct dst_entry *dst)
+static int dccp_v6_send_response(struct sock *sk, struct request_sock *req)
 {
        struct inet6_request_sock *ireq6 = inet6_rsk(req);
        struct ipv6_pinfo *np = inet6_sk(sk);
@@ -234,6 +233,7 @@ static int dccp_v6_send_response(struct sock *sk, struct request_sock *req,
        struct in6_addr *final_p = NULL, final;
        struct flowi fl;
        int err = -1;
+       struct dst_entry *dst;
 
        memset(&fl, 0, sizeof(fl));
        fl.proto = IPPROTO_DCCP;
@@ -245,28 +245,26 @@ static int dccp_v6_send_response(struct sock *sk, struct request_sock *req,
        fl.fl_ip_sport = inet_sk(sk)->sport;
        security_req_classify_flow(req, &fl);
 
-       if (dst == NULL) {
-               opt = np->opt;
+       opt = np->opt;
 
-               if (opt != NULL && opt->srcrt != NULL) {
-                       const struct rt0_hdr *rt0 = (struct rt0_hdr *)opt->srcrt;
+       if (opt != NULL && opt->srcrt != NULL) {
+               const struct rt0_hdr *rt0 = (struct rt0_hdr *)opt->srcrt;
 
-                       ipv6_addr_copy(&final, &fl.fl6_dst);
-                       ipv6_addr_copy(&fl.fl6_dst, rt0->addr);
-                       final_p = &final;
-               }
+               ipv6_addr_copy(&final, &fl.fl6_dst);
+               ipv6_addr_copy(&fl.fl6_dst, rt0->addr);
+               final_p = &final;
+       }
 
-               err = ip6_dst_lookup(sk, &dst, &fl);
-               if (err)
-                       goto done;
+       err = ip6_dst_lookup(sk, &dst, &fl);
+       if (err)
+               goto done;
 
-               if (final_p)
-                       ipv6_addr_copy(&fl.fl6_dst, final_p);
+       if (final_p)
+               ipv6_addr_copy(&fl.fl6_dst, final_p);
 
-               err = xfrm_lookup(&dst, &fl, sk, 0);
-               if (err < 0)
-                       goto done;
-       }
+       err = xfrm_lookup(&dst, &fl, sk, 0);
+       if (err < 0)
+               goto done;
 
        skb = dccp_make_response(sk, dst, req);
        if (skb != NULL) {
@@ -448,7 +446,7 @@ static int dccp_v6_conn_request(struct sock *sk, struct sk_buff *skb)
        dreq->dreq_iss     = dccp_v6_init_sequence(skb);
        dreq->dreq_service = service;
 
-       if (dccp_v6_send_response(sk, req, NULL))
+       if (dccp_v6_send_response(sk, req))
                goto drop_and_free;
 
        inet6_csk_reqsk_queue_hash_add(sk, req, DCCP_TIMEOUT_INIT);
@@ -1128,7 +1126,7 @@ static struct proto dccp_v6_prot = {
        .obj_size          = sizeof(struct dccp6_sock),
        .rsk_prot          = &dccp6_request_sock_ops,
        .twsk_prot         = &dccp6_timewait_sock_ops,
-       .hashinfo          = &dccp_hashinfo,
+       .h.hashinfo        = &dccp_hashinfo,
 #ifdef CONFIG_COMPAT
        .compat_setsockopt = compat_dccp_setsockopt,
        .compat_getsockopt = compat_dccp_getsockopt,