diff options
Diffstat (limited to 'net/unix/af_unix.c')
| -rw-r--r-- | net/unix/af_unix.c | 13 | 
1 files changed, 4 insertions, 9 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index ddb838a1b74c..67e87db5877f 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c @@ -1,13 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-or-later  /*   * NET4:	Implementation of BSD Unix domain sockets.   *   * Authors:	Alan Cox, <alan@lxorguk.ukuu.org.uk>   * - *		This program is free software; you can redistribute it and/or - *		modify it under the terms of the GNU General Public License - *		as published by the Free Software Foundation; either version - *		2 of the License, or (at your option) any later version. - *   * Fixes:   *		Linus Torvalds	:	Assorted bug cures.   *		Niibe Yutaka	:	async I/O support. @@ -49,7 +45,6 @@   *	     				the core infrastructure is doing that   *	     				for all net proto families now (2.5.69+)   * - *   * Known differences from reference BSD that was tested:   *   *	[TO FIX] @@ -2040,8 +2035,8 @@ static int unix_dgram_recvmsg(struct socket *sock, struct msghdr *msg,  	struct unix_sock *u = unix_sk(sk);  	struct sk_buff *skb, *last;  	long timeo; +	int skip;  	int err; -	int peeked, skip;  	err = -EOPNOTSUPP;  	if (flags&MSG_OOB) @@ -2053,8 +2048,8 @@ static int unix_dgram_recvmsg(struct socket *sock, struct msghdr *msg,  		mutex_lock(&u->iolock);  		skip = sk_peek_offset(sk, flags); -		skb = __skb_try_recv_datagram(sk, flags, NULL, &peeked, &skip, -					      &err, &last); +		skb = __skb_try_recv_datagram(sk, flags, NULL, &skip, &err, +					      &last);  		if (skb)  			break;  | 
