From nobody Tue Jan 9 01:21:05 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T8Cmx4wstz55V0k; Tue, 9 Jan 2024 01:21:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T8Cmx3Dnbz4N1g; Tue, 9 Jan 2024 01:21:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704763265; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yBz/wcImfEYmc2NbWWos+bMu35012l8nrR0FDYIlBbI=; b=hi+JOz+UVLfiGZUJxjy+7lMhHKiWBNtUSXthX+QySzIduJshg9ITY1/4rwcQOGfDnA9htP BJRyy/SApux48uE1qaBo8wtgNJ6vXHCSxnnnyKQZUNWd2NF01E5Zqy8uVgvF9/YCt8s85/ BqEIlyRf7hxylgejDHj0bn5LdmUglpRu8w5XBc19OkltKGKrmDVNKTP2xWhMU9h9dk/tc5 psnZqeTYfMHsALwjSHbKJKs5DgNNihi0p0HI9dPHqIvLmfG7mEe2RMSaYGouaLhmCoNL/Q an+9dNsaMVFU/mOzNVMA7/OXtJ9EmznY8CX6w06Wi2VNgIugitTdOvyixB75EQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704763265; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yBz/wcImfEYmc2NbWWos+bMu35012l8nrR0FDYIlBbI=; b=rP0wHKjuVt6WqSYyrtCVMSf8ewMMn82f3prrU/nNGqvEHLgx09JsTFOdxEDA3PvPR0CF6o AjSbaSFGLCBU3txlGIdpSC48BjQ2b05Ebn2+aoIaOFvoJTdYUlbu2azMgTVBvaLM3boYOJ Wy/dASvdsaEbsUAWIhrkUHEH/zxFIkNddPGLX3K3SKvof6ik36dB8Sm6e2X2hObzaZsWKc MrcvY7+wxRnpjFlMFnvMcHFyQpLnOqf6r01Cm5eHZbWuMh8NjHFIRVpMEHbdIV4+JWlBd5 OOemNrPgSxsZSSEVQ7301zoQ/wSYCizf+FlT402gE9uEKxeEC3Ht/7Y7eTHAQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704763265; a=rsa-sha256; cv=none; b=fecsmgXp+66qoHHGlFjEjoTBZ3BymfbnVViBiWCer9x99qAHQ+gYLxXTqC8E75cgXoiUEB hrJRS7azUGPqQjxu+pyQKgkylrBjI9Scf2OW8EeryYEFxrdhJ7SdE4zGabM6YtKMrA7Ir+ a/P6l7lQa6+04lb342bIqG7OKVmJ+wYjr9asYnSk0FUhikzQ4+UKr4Upp9NSw2NbJlLAtW fXUQI9ASpN8hBwWJEXP1J9f52WSsKu4HNQS8bk7IQEvN3FeiEOETNVBQy7hRDgm7zKe2yW R589Q/3OLmN1vD98YEM4Pjf5S+zZK05qveu7LBr9UgaBVuf0caRYw5qeB6Pi0A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T8Cmx2JkSzWvN; Tue, 9 Jan 2024 01:21:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4091L58R009389; Tue, 9 Jan 2024 01:21:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4091L5nR009386; Tue, 9 Jan 2024 01:21:05 GMT (envelope-from git) Date: Tue, 9 Jan 2024 01:21:05 GMT Message-Id: <202401090121.4091L5nR009386@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: af9f4ac57ade - main - netlink: just return EOPNOTSUPP on shutdown(2) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: af9f4ac57ade116293c0a65c5201658b5e424ff6 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=af9f4ac57ade116293c0a65c5201658b5e424ff6 commit af9f4ac57ade116293c0a65c5201658b5e424ff6 Author: Gleb Smirnoff AuthorDate: 2024-01-09 01:20:30 +0000 Commit: Gleb Smirnoff CommitDate: 2024-01-09 01:20:30 +0000 netlink: just return EOPNOTSUPP on shutdown(2) This matches what Linux does. Reviewed by: melifaro, tuexen Differential Revision: https://reviews.freebsd.org/D43366 --- sys/netlink/netlink_domain.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/sys/netlink/netlink_domain.c b/sys/netlink/netlink_domain.c index 4630c12b54a8..7660dcada103 100644 --- a/sys/netlink/netlink_domain.c +++ b/sys/netlink/netlink_domain.c @@ -545,15 +545,6 @@ nl_pru_disconnect(struct socket *so) return (ENOTCONN); } -static int -nl_pru_shutdown(struct socket *so) -{ - NL_LOG(LOG_DEBUG3, "socket %p, PID %d", so, curproc->p_pid); - MPASS(sotonlpcb(so) != NULL); - socantsendmore(so); - return (0); -} - static int nl_sockaddr(struct socket *so, struct sockaddr *sa) { @@ -990,7 +981,6 @@ nl_setsbopt(struct socket *so, struct sockopt *sopt) .pr_disconnect = nl_pru_disconnect, \ .pr_sosend = nl_sosend, \ .pr_soreceive = nl_soreceive, \ - .pr_shutdown = nl_pru_shutdown, \ .pr_sockaddr = nl_sockaddr, \ .pr_close = nl_close