release/3.0.0

1 files changed, 1 insertions, 39 deletions

diff --git a/sys/i386/linux/linux_socket.c b/sys/i386/linux/linux_socket.c
index e757fc13c7f81..b50cf5860e319 100644
--- a/sys/i386/linux/linux_socket.c
+++ b/sys/i386/linux/linux_socket.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: linux_socket.c,v 1.14 1998/12/30 21:20:00 sos Exp $
+ *  $Id: linux_socket.c,v 1.12 1998/02/07 02:13:27 msmith Exp $
  */
 
 /* XXX we use functions that might not exist. */
@@ -810,44 +810,6 @@ linux_socketcall(struct proc *p, struct linux_socketcall_args *args)
 	return linux_setsockopt(p, args->args);
     case LINUX_GETSOCKOPT:
 	return linux_getsockopt(p, args->args);
-    case LINUX_SENDMSG:
-	do {
-		int error;
-		int level;
-		caddr_t control;
-		struct {
-			int s;
-			const struct msghdr *msg;
-			int flags;
-		} *uap = args->args;
-
-		error = copyin(&uap->msg->msg_control,
-				&control, sizeof(caddr_t));
-		if (error)
-			return error;
-		if (control == NULL)
-			goto done;
-		error = copyin(&((struct cmsghdr *)control)->cmsg_level,
-				&level, sizeof(int));
-		if (error)
-			return error;
-		if (level == 1) {
-		/*
-		 * Linux thinks that SOL_SOCKET is 1; we know that it's really
-		 * 0xffff, of course.
-		 */
-			level = SOL_SOCKET;
-			error = copyout(&level, &((struct cmsghdr *)control)->
-					cmsg_level, sizeof(int));
-			if (error)
-				return error;
-		}
-	done:
-		return sendmsg(p, args->args);
-	} while (0);
-    case LINUX_RECVMSG:
-	return recvmsg(p, args->args);
-
     default:
 	uprintf("LINUX: 'socket' typ=%d not implemented\n", args->what);
 	return ENOSYS;