1 files changed, 18 insertions, 10 deletions

diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 64d94afa427f..1f04ec0e4a7a 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -69,6 +69,8 @@
 #include <crypto/hash.h>
 #include <linux/scatterlist.h>
 
+#include <trace/events/tcp.h>
+
 static void     tcp_v6_send_reset(const struct sock *sk, struct sk_buff *skb);
 static void     tcp_v6_reqsk_send_ack(const struct sock *sk, struct sk_buff *skb,
                                       struct request_sock *req);
@@ -890,7 +892,7 @@ static void tcp_v6_send_reset(const struct sock *sk, struct sk_buff *skb)
         int genhash;
         struct sock *sk1 = NULL;
 #endif
-        int oif;
+        int oif = 0;
 
         if (th->rst)
                 return;
@@ -939,7 +941,11 @@ static void tcp_v6_send_reset(const struct sock *sk, struct sk_buff *skb)
                 ack_seq = ntohl(th->seq) + th->syn + th->fin + skb->len -
                           (th->doff << 2);
 
-        oif = sk ? sk->sk_bound_dev_if : 0;
+        if (sk) {
+                oif = sk->sk_bound_dev_if;
+                trace_tcp_send_reset(sk, skb);
+        }
+
         tcp_v6_send_response(sk, skb, seq, ack_seq, 0, 0, 0, oif, key, 1, 0, 0);
 
 #ifdef CONFIG_TCP_MD5SIG
@@ -1448,7 +1454,6 @@ process:
                 struct sock *nsk;
 
                 sk = req->rsk_listener;
-                tcp_v6_fill_cb(skb, hdr, th);
                 if (tcp_v6_inbound_md5_hash(sk, skb)) {
                         sk_drops_add(sk, skb);
                         reqsk_put(req);
@@ -1461,8 +1466,12 @@ process:
                 sock_hold(sk);
                 refcounted = true;
                 nsk = NULL;
-                if (!tcp_filter(sk, skb))
+                if (!tcp_filter(sk, skb)) {
+                        th = (const struct tcphdr *)skb->data;
+                        hdr = ipv6_hdr(skb);
+                        tcp_v6_fill_cb(skb, hdr, th);
                         nsk = tcp_check_req(sk, skb, req, false);
+                }
                 if (!nsk) {
                         reqsk_put(req);
                         goto discard_and_relse;
@@ -1486,8 +1495,6 @@ process:
         if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, skb))
                 goto discard_and_relse;
 
-        tcp_v6_fill_cb(skb, hdr, th);
-
         if (tcp_v6_inbound_md5_hash(sk, skb))
                 goto discard_and_relse;
 
@@ -1495,6 +1502,7 @@ process:
                 goto discard_and_relse;
         th = (const struct tcphdr *)skb->data;
         hdr = ipv6_hdr(skb);
+        tcp_v6_fill_cb(skb, hdr, th);
 
         skb->dev = NULL;
 
@@ -1577,13 +1585,13 @@ do_time_wait:
                         refcounted = false;
                         goto process;
                 }
-                /* Fall through to ACK */
         }
+                /* to ACK */
+                /* fall through */
         case TCP_TW_ACK:
                 tcp_v6_timewait_ack(sk, skb);
                 break;
         case TCP_TW_RST:
-                tcp_v6_restore_cb(skb);
                 tcp_v6_send_reset(sk, skb);
                 inet_twsk_deschedule_put(inet_twsk(sk));
                 goto discard_it;
@@ -1933,8 +1941,8 @@ struct proto tcpv6_prot = {
         .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,
+        .sysctl_wmem_offset     = offsetof(struct net, ipv4.sysctl_tcp_wmem),
+        .sysctl_rmem_offset     = offsetof(struct net, ipv4.sysctl_tcp_rmem),
         .max_header             = MAX_TCP_HEADER,
         .obj_size               = sizeof(struct tcp6_sock),
         .slab_flags             = SLAB_TYPESAFE_BY_RCU,