diff options
author | 2024-01-26 10:26:50 +0100 | |
---|---|---|
committer | 2024-01-26 10:26:50 +0100 | |
commit | 42ac0be18bfa09c03f52244f7c3e15c89b38532f (patch) | |
tree | 601fd5e6da2ca0b77aa8cb22f0e81a29ba6fe1d6 /net/unix/af_unix.c | |
parent | x86/mm: Ensure input to pfn_to_kaddr() is treated as a 64-bit type (diff) | |
parent | Merge tag 'net-6.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (diff) | |
download | wireguard-linux-42ac0be18bfa09c03f52244f7c3e15c89b38532f.tar.xz wireguard-linux-42ac0be18bfa09c03f52244f7c3e15c89b38532f.zip |
Merge branch 'linus' into x86/mm, to refresh the branch and pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to '')
-rw-r--r-- | net/unix/af_unix.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index a357dc5f2404..ac1f2bc18fc9 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c @@ -213,8 +213,6 @@ static inline bool unix_secdata_eq(struct scm_cookie *scm, struct sk_buff *skb) } #endif /* CONFIG_SECURITY_NETWORK */ -#define unix_peer(sk) (unix_sk(sk)->peer) - static inline int unix_our_peer(struct sock *sk, struct sock *osk) { return unix_peer(osk) == sk; |