1 files changed, 57 insertions, 56 deletions

diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 5c71501fc917..0740f93a114a 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -192,13 +192,13 @@ static int tcp_v6_connect(struct sock *sk, struct sockaddr *uaddr,
         }
 
         if (tp->rx_opt.ts_recent_stamp &&
-            !ipv6_addr_equal(&np->daddr, &usin->sin6_addr)) {
+            !ipv6_addr_equal(&sk->sk_v6_daddr, &usin->sin6_addr)) {
                 tp->rx_opt.ts_recent = 0;
                 tp->rx_opt.ts_recent_stamp = 0;
                 tp->write_seq = 0;
         }
 
-        np->daddr = usin->sin6_addr;
+        sk->sk_v6_daddr = usin->sin6_addr;
         np->flow_label = fl6.flowlabel;
 
         /*
@@ -237,17 +237,17 @@ static int tcp_v6_connect(struct sock *sk, struct sockaddr *uaddr,
                 } else {
                         ipv6_addr_set_v4mapped(inet->inet_saddr, &np->saddr);
                         ipv6_addr_set_v4mapped(inet->inet_rcv_saddr,
-                                               &np->rcv_saddr);
+                                               &sk->sk_v6_rcv_saddr);
                 }
 
                 return err;
         }
 
-        if (!ipv6_addr_any(&np->rcv_saddr))
-                saddr = &np->rcv_saddr;
+        if (!ipv6_addr_any(&sk->sk_v6_rcv_saddr))
+                saddr = &sk->sk_v6_rcv_saddr;
 
         fl6.flowi6_proto = IPPROTO_TCP;
-        fl6.daddr = np->daddr;
+        fl6.daddr = sk->sk_v6_daddr;
         fl6.saddr = saddr ? *saddr : np->saddr;
         fl6.flowi6_oif = sk->sk_bound_dev_if;
         fl6.flowi6_mark = sk->sk_mark;
@@ -266,7 +266,7 @@ static int tcp_v6_connect(struct sock *sk, struct sockaddr *uaddr,
 
         if (saddr == NULL) {
                 saddr = &fl6.saddr;
-                np->rcv_saddr = *saddr;
+                sk->sk_v6_rcv_saddr = *saddr;
         }
 
         /* set the source address */
@@ -279,7 +279,7 @@ static int tcp_v6_connect(struct sock *sk, struct sockaddr *uaddr,
         rt = (struct rt6_info *) dst;
         if (tcp_death_row.sysctl_tw_recycle &&
             !tp->rx_opt.ts_recent_stamp &&
-            ipv6_addr_equal(&rt->rt6i_dst.addr, &np->daddr))
+            ipv6_addr_equal(&rt->rt6i_dst.addr, &sk->sk_v6_daddr))
                 tcp_fetch_timewait_stamp(sk, dst);
 
         icsk->icsk_ext_hdr_len = 0;
@@ -298,7 +298,7 @@ static int tcp_v6_connect(struct sock *sk, struct sockaddr *uaddr,
 
         if (!tp->write_seq && likely(!tp->repair))
                 tp->write_seq = secure_tcpv6_sequence_number(np->saddr.s6_addr32,
-                                                             np->daddr.s6_addr32,
+                                                             sk->sk_v6_daddr.s6_addr32,
                                                              inet->inet_sport,
                                                              inet->inet_dport);
 
@@ -465,7 +465,7 @@ static int tcp_v6_send_synack(struct sock *sk, struct dst_entry *dst,
                               struct request_sock *req,
                               u16 queue_mapping)
 {
-        struct inet6_request_sock *treq = inet6_rsk(req);
+        struct inet_request_sock *ireq = inet_rsk(req);
         struct ipv6_pinfo *np = inet6_sk(sk);
         struct sk_buff * skb;
         int err = -ENOMEM;
@@ -477,9 +477,10 @@ static int tcp_v6_send_synack(struct sock *sk, struct dst_entry *dst,
         skb = tcp_make_synack(sk, dst, req, NULL);
 
         if (skb) {
-                __tcp_v6_send_check(skb, &treq->loc_addr, &treq->rmt_addr);
+                __tcp_v6_send_check(skb, &ireq->ir_v6_loc_addr,
+                                    &ireq->ir_v6_rmt_addr);
 
-                fl6->daddr = treq->rmt_addr;
+                fl6->daddr = ireq->ir_v6_rmt_addr;
                 skb_set_queue_mapping(skb, queue_mapping);
                 err = ip6_xmit(sk, skb, fl6, np->opt, np->tclass);
                 err = net_xmit_eval(err);
@@ -502,7 +503,7 @@ static int tcp_v6_rtx_synack(struct sock *sk, struct request_sock *req)
 
 static void tcp_v6_reqsk_destructor(struct request_sock *req)
 {
-        kfree_skb(inet6_rsk(req)->pktopts);
+        kfree_skb(inet_rsk(req)->pktopts);
 }
 
 #ifdef CONFIG_TCP_MD5SIG
@@ -515,13 +516,13 @@ static struct tcp_md5sig_key *tcp_v6_md5_do_lookup(struct sock *sk,
 static struct tcp_md5sig_key *tcp_v6_md5_lookup(struct sock *sk,
                                                 struct sock *addr_sk)
 {
-        return tcp_v6_md5_do_lookup(sk, &inet6_sk(addr_sk)->daddr);
+        return tcp_v6_md5_do_lookup(sk, &addr_sk->sk_v6_daddr);
 }
 
 static struct tcp_md5sig_key *tcp_v6_reqsk_md5_lookup(struct sock *sk,
                                                       struct request_sock *req)
 {
-        return tcp_v6_md5_do_lookup(sk, &inet6_rsk(req)->rmt_addr);
+        return tcp_v6_md5_do_lookup(sk, &inet_rsk(req)->ir_v6_rmt_addr);
 }
 
 static int tcp_v6_parse_md5_keys (struct sock *sk, char __user *optval,
@@ -621,10 +622,10 @@ static int tcp_v6_md5_hash_skb(char *md5_hash, struct tcp_md5sig_key *key,
 
         if (sk) {
                 saddr = &inet6_sk(sk)->saddr;
-                daddr = &inet6_sk(sk)->daddr;
+                daddr = &sk->sk_v6_daddr;
         } else if (req) {
-                saddr = &inet6_rsk(req)->loc_addr;
-                daddr = &inet6_rsk(req)->rmt_addr;
+                saddr = &inet_rsk(req)->ir_v6_loc_addr;
+                daddr = &inet_rsk(req)->ir_v6_rmt_addr;
         } else {
                 const struct ipv6hdr *ip6h = ipv6_hdr(skb);
                 saddr = &ip6h->saddr;
@@ -949,7 +950,7 @@ static int tcp_v6_conn_request(struct sock *sk, struct sk_buff *skb)
 {
         struct tcp_options_received tmp_opt;
         struct request_sock *req;
-        struct inet6_request_sock *treq;
+        struct inet_request_sock *ireq;
         struct ipv6_pinfo *np = inet6_sk(sk);
         struct tcp_sock *tp = tcp_sk(sk);
         __u32 isn = TCP_SKB_CB(skb)->when;
@@ -994,25 +995,25 @@ static int tcp_v6_conn_request(struct sock *sk, struct sk_buff *skb)
         tmp_opt.tstamp_ok = tmp_opt.saw_tstamp;
         tcp_openreq_init(req, &tmp_opt, skb);
 
-        treq = inet6_rsk(req);
-        treq->rmt_addr = ipv6_hdr(skb)->saddr;
-        treq->loc_addr = ipv6_hdr(skb)->daddr;
+        ireq = inet_rsk(req);
+        ireq->ir_v6_rmt_addr = ipv6_hdr(skb)->saddr;
+        ireq->ir_v6_loc_addr = ipv6_hdr(skb)->daddr;
         if (!want_cookie || tmp_opt.tstamp_ok)
                 TCP_ECN_create_request(req, skb, sock_net(sk));
 
-        treq->iif = sk->sk_bound_dev_if;
+        ireq->ir_iif = sk->sk_bound_dev_if;
 
         /* So that link locals have meaning */
         if (!sk->sk_bound_dev_if &&
-            ipv6_addr_type(&treq->rmt_addr) & IPV6_ADDR_LINKLOCAL)
-                treq->iif = inet6_iif(skb);
+            ipv6_addr_type(&ireq->ir_v6_rmt_addr) & IPV6_ADDR_LINKLOCAL)
+                ireq->ir_iif = inet6_iif(skb);
 
         if (!isn) {
                 if (ipv6_opt_accepted(sk, skb) ||
                     np->rxopt.bits.rxinfo || np->rxopt.bits.rxoinfo ||
                     np->rxopt.bits.rxhlim || np->rxopt.bits.rxohlim) {
                         atomic_inc(&skb->users);
-                        treq->pktopts = skb;
+                        ireq->pktopts = skb;
                 }
 
                 if (want_cookie) {
@@ -1051,7 +1052,7 @@ static int tcp_v6_conn_request(struct sock *sk, struct sk_buff *skb)
                          * to the moment of synflood.
                          */
                         LIMIT_NETDEBUG(KERN_DEBUG "TCP: drop open request from %pI6/%u\n",
-                                       &treq->rmt_addr, ntohs(tcp_hdr(skb)->source));
+                                       &ireq->ir_v6_rmt_addr, ntohs(tcp_hdr(skb)->source));
                         goto drop_and_release;
                 }
 
@@ -1086,7 +1087,7 @@ static struct sock * tcp_v6_syn_recv_sock(struct sock *sk, struct sk_buff *skb,
                                           struct request_sock *req,
                                           struct dst_entry *dst)
 {
-        struct inet6_request_sock *treq;
+        struct inet_request_sock *ireq;
         struct ipv6_pinfo *newnp, *np = inet6_sk(sk);
         struct tcp6_sock *newtcp6sk;
         struct inet_sock *newinet;
@@ -1116,11 +1117,11 @@ static struct sock * tcp_v6_syn_recv_sock(struct sock *sk, struct sk_buff *skb,
 
                 memcpy(newnp, np, sizeof(struct ipv6_pinfo));
 
-                ipv6_addr_set_v4mapped(newinet->inet_daddr, &newnp->daddr);
+                ipv6_addr_set_v4mapped(newinet->inet_daddr, &newsk->sk_v6_daddr);
 
                 ipv6_addr_set_v4mapped(newinet->inet_saddr, &newnp->saddr);
 
-                newnp->rcv_saddr = newnp->saddr;
+                newsk->sk_v6_rcv_saddr = newnp->saddr;
 
                 inet_csk(newsk)->icsk_af_ops = &ipv6_mapped;
                 newsk->sk_backlog_rcv = tcp_v4_do_rcv;
@@ -1151,7 +1152,7 @@ static struct sock * tcp_v6_syn_recv_sock(struct sock *sk, struct sk_buff *skb,
                 return newsk;
         }
 
-        treq = inet6_rsk(req);
+        ireq = inet_rsk(req);
 
         if (sk_acceptq_is_full(sk))
                 goto out_overflow;
@@ -1185,10 +1186,10 @@ static struct sock * tcp_v6_syn_recv_sock(struct sock *sk, struct sk_buff *skb,
 
         memcpy(newnp, np, sizeof(struct ipv6_pinfo));
 
-        newnp->daddr = treq->rmt_addr;
-        newnp->saddr = treq->loc_addr;
-        newnp->rcv_saddr = treq->loc_addr;
-        newsk->sk_bound_dev_if = treq->iif;
+        newsk->sk_v6_daddr = ireq->ir_v6_rmt_addr;
+        newnp->saddr = ireq->ir_v6_loc_addr;
+        newsk->sk_v6_rcv_saddr = ireq->ir_v6_loc_addr;
+        newsk->sk_bound_dev_if = ireq->ir_iif;
 
         /* Now IPv6 options...
 
@@ -1203,11 +1204,11 @@ static struct sock * tcp_v6_syn_recv_sock(struct sock *sk, struct sk_buff *skb,
 
         /* Clone pktoptions received with SYN */
         newnp->pktoptions = NULL;
-        if (treq->pktopts != NULL) {
-                newnp->pktoptions = skb_clone(treq->pktopts,
+        if (ireq->pktopts != NULL) {
+                newnp->pktoptions = skb_clone(ireq->pktopts,
                                               sk_gfp_atomic(sk, GFP_ATOMIC));
-                consume_skb(treq->pktopts);
-                treq->pktopts = NULL;
+                consume_skb(ireq->pktopts);
+                ireq->pktopts = NULL;
                 if (newnp->pktoptions)
                         skb_set_owner_r(newnp->pktoptions, newsk);
         }
@@ -1244,13 +1245,13 @@ static struct sock * tcp_v6_syn_recv_sock(struct sock *sk, struct sk_buff *skb,
 
 #ifdef CONFIG_TCP_MD5SIG
         /* Copy over the MD5 key from the original socket */
-        if ((key = tcp_v6_md5_do_lookup(sk, &newnp->daddr)) != NULL) {
+        if ((key = tcp_v6_md5_do_lookup(sk, &newsk->sk_v6_daddr)) != NULL) {
                 /* We're using one, so create a matching key
                  * on the newsk structure. If we fail to get
                  * memory, then we end up not copying the key
                  * across. Shucks.
                  */
-                tcp_md5_do_add(newsk, (union tcp_md5_addr *)&newnp->daddr,
+                tcp_md5_do_add(newsk, (union tcp_md5_addr *)&newsk->sk_v6_daddr,
                                AF_INET6, key->key, key->keylen,
                                sk_gfp_atomic(sk, GFP_ATOMIC));
         }
@@ -1722,8 +1723,8 @@ static void get_openreq6(struct seq_file *seq,
                          const struct sock *sk, struct request_sock *req, int i, kuid_t uid)
 {
         int ttd = req->expires - jiffies;
-        const struct in6_addr *src = &inet6_rsk(req)->loc_addr;
-        const struct in6_addr *dest = &inet6_rsk(req)->rmt_addr;
+        const struct in6_addr *src = &inet_rsk(req)->ir_v6_loc_addr;
+        const struct in6_addr *dest = &inet_rsk(req)->ir_v6_rmt_addr;
 
         if (ttd < 0)
                 ttd = 0;
@@ -1734,10 +1735,10 @@ static void get_openreq6(struct seq_file *seq,
                    i,
                    src->s6_addr32[0], src->s6_addr32[1],
                    src->s6_addr32[2], src->s6_addr32[3],
-                   ntohs(inet_rsk(req)->loc_port),
+                   inet_rsk(req)->ir_num,
                    dest->s6_addr32[0], dest->s6_addr32[1],
                    dest->s6_addr32[2], dest->s6_addr32[3],
-                   ntohs(inet_rsk(req)->rmt_port),
+                   ntohs(inet_rsk(req)->ir_rmt_port),
                    TCP_SYN_RECV,
                    0,0, /* could print option size, but that is af dependent. */
                    1,   /* timers active (only the expire timer) */
@@ -1758,10 +1759,9 @@ static void get_tcp6_sock(struct seq_file *seq, struct sock *sp, int i)
         const struct inet_sock *inet = inet_sk(sp);
         const struct tcp_sock *tp = tcp_sk(sp);
         const struct inet_connection_sock *icsk = inet_csk(sp);
-        const struct ipv6_pinfo *np = inet6_sk(sp);
 
-        dest  = &np->daddr;
-        src   = &np->rcv_saddr;
+        dest  = &sp->sk_v6_daddr;
+        src   = &sp->sk_v6_rcv_saddr;
         destp = ntohs(inet->inet_dport);
         srcp  = ntohs(inet->inet_sport);
 
@@ -1810,11 +1810,10 @@ static void get_timewait6_sock(struct seq_file *seq,
 {
         const struct in6_addr *dest, *src;
         __u16 destp, srcp;
-        const struct inet6_timewait_sock *tw6 = inet6_twsk((struct sock *)tw);
-        long delta = tw->tw_ttd - jiffies;
+        s32 delta = tw->tw_ttd - inet_tw_time_stamp();
 
-        dest = &tw6->tw_v6_daddr;
-        src  = &tw6->tw_v6_rcv_saddr;
+        dest = &tw->tw_v6_daddr;
+        src  = &tw->tw_v6_rcv_saddr;
         destp = ntohs(tw->tw_dport);
         srcp  = ntohs(tw->tw_sport);
 
@@ -1834,6 +1833,7 @@ static void get_timewait6_sock(struct seq_file *seq,
 static int tcp6_seq_show(struct seq_file *seq, void *v)
 {
         struct tcp_iter_state *st;
+        struct sock *sk = v;
 
         if (v == SEQ_START_TOKEN) {
                 seq_puts(seq,
@@ -1849,14 +1849,14 @@ static int tcp6_seq_show(struct seq_file *seq, void *v)
         switch (st->state) {
         case TCP_SEQ_STATE_LISTENING:
         case TCP_SEQ_STATE_ESTABLISHED:
-                get_tcp6_sock(seq, v, st->num);
+                if (sk->sk_state == TCP_TIME_WAIT)
+                        get_timewait6_sock(seq, v, st->num);
+                else
+                        get_tcp6_sock(seq, v, st->num);
                 break;
         case TCP_SEQ_STATE_OPENREQ:
                 get_openreq6(seq, st->syn_wait_sk, v, st->num, st->uid);
                 break;
-        case TCP_SEQ_STATE_TIME_WAIT:
-                get_timewait6_sock(seq, v, st->num);
-                break;
         }
 out:
         return 0;
@@ -1929,6 +1929,7 @@ struct proto tcpv6_prot = {
         .memory_allocated       = &tcp_memory_allocated,
         .memory_pressure        = &tcp_memory_pressure,
         .orphan_count           = &tcp_orphan_count,
+        .sysctl_mem             = sysctl_tcp_mem,
         .sysctl_wmem            = sysctl_tcp_wmem,
         .sysctl_rmem            = sysctl_tcp_rmem,
         .max_header             = MAX_TCP_HEADER,