x86: add tizen_qemu_x86_defconfig & tizen_qemu_x86_64_defconfig

[platform/kernel/linux-rpi.git] / net / socket.c

diff --git a/net/socket.c b/net/socket.c
index 7f64a6e..73666b8 100644 (file)
--- a/net/socket.c
+++ b/net/socket.c
@@ -829,6 +829,7 @@ void __sock_recv_timestamp(struct msghdr *msg, struct sock *sk,
        int empty = 1, false_tstamp = 0;
        struct skb_shared_hwtstamps *shhwtstamps =
                skb_hwtstamps(skb);
+       ktime_t hwtstamp;
 
        /* Race occurred between timestamp enabling and packet
           receiving.  Fill in the current time for now. */
@@ -877,10 +878,12 @@ void __sock_recv_timestamp(struct msghdr *msg, struct sock *sk,
            (sk->sk_tsflags & SOF_TIMESTAMPING_RAW_HARDWARE) &&
            !skb_is_swtx_tstamp(skb, false_tstamp)) {
                if (sk->sk_tsflags & SOF_TIMESTAMPING_BIND_PHC)
-                       ptp_convert_timestamp(shhwtstamps, sk->sk_bind_phc);
+                       hwtstamp = ptp_convert_timestamp(shhwtstamps,
+                                                        sk->sk_bind_phc);
+               else
+                       hwtstamp = shhwtstamps->hwtstamp;
 
-               if (ktime_to_timespec64_cond(shhwtstamps->hwtstamp,
-                                            tss.ts + 2)) {
+               if (ktime_to_timespec64_cond(hwtstamp, tss.ts + 2)) {
                        empty = 0;
 
                        if ((sk->sk_tsflags & SOF_TIMESTAMPING_OPT_PKTINFO) &&
@@ -1718,7 +1721,7 @@ int __sys_listen(int fd, int backlog)
 
        sock = sockfd_lookup_light(fd, &err, &fput_needed);
        if (sock) {
-               somaxconn = sock_net(sock->sk)->core.sysctl_somaxconn;
+               somaxconn = READ_ONCE(sock_net(sock->sk)->core.sysctl_somaxconn);
                if ((unsigned int)backlog > somaxconn)
                        backlog = somaxconn;