iwlwifi: tracing: decouple from mac80211

[cascardo/linux.git] / net / socket.c

diff --git a/net/socket.c b/net/socket.c
index 5f77a8e..afa3c34 100644 (file)
--- a/net/socket.c
+++ b/net/socket.c
@@ -587,20 +587,20 @@ void sock_release(struct socket *sock)
 }
 EXPORT_SYMBOL(sock_release);
 
-void __sock_tx_timestamp(const struct sock *sk, __u8 *tx_flags)
+void __sock_tx_timestamp(__u16 tsflags, __u8 *tx_flags)
 {
        u8 flags = *tx_flags;
 
-       if (sk->sk_tsflags & SOF_TIMESTAMPING_TX_HARDWARE)
+       if (tsflags & SOF_TIMESTAMPING_TX_HARDWARE)
                flags |= SKBTX_HW_TSTAMP;
 
-       if (sk->sk_tsflags & SOF_TIMESTAMPING_TX_SOFTWARE)
+       if (tsflags & SOF_TIMESTAMPING_TX_SOFTWARE)
                flags |= SKBTX_SW_TSTAMP;
 
-       if (sk->sk_tsflags & SOF_TIMESTAMPING_TX_SCHED)
+       if (tsflags & SOF_TIMESTAMPING_TX_SCHED)
                flags |= SKBTX_SCHED_TSTAMP;
 
-       if (sk->sk_tsflags & SOF_TIMESTAMPING_TX_ACK)
+       if (tsflags & SOF_TIMESTAMPING_TX_ACK)
                flags |= SKBTX_ACK_TSTAMP;
 
        *tx_flags = flags;
@@ -1046,7 +1046,7 @@ static int sock_fasync(int fd, struct file *filp, int on)
                return -EINVAL;
 
        lock_sock(sk);
-       wq = rcu_dereference_protected(sock->wq, sock_owned_by_user(sk));
+       wq = rcu_dereference_protected(sock->wq, lockdep_sock_is_held(sk));
        fasync_helper(fd, filp, on, &wq->fasync_list);
 
        if (!wq->fasync_list)