From nobody Thu Aug 17 19:58:34 2023 X-Original-To: dev-commits-src-all@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 4RRbRG3Mpnz4q54m; Thu, 17 Aug 2023 19:58:34 +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 4RRbRG2rlwz4HTC; Thu, 17 Aug 2023 19:58:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692302314; 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=ev5whL04kMtWu3efabupViDXOiLchRr7tRTlsXsCr/8=; b=ceC0MGM5ANYadNN/Wu9A1wZDMiTFSJTlY77HkTzceAzOVkMgJEuFe9Z6KajIxwNhZfwmtx Hoja2M7pn02ICQMJMOJzquHevCvlehP+kz6FiJQEvrNwEFbHk/3atN+MATl2lC9ZrZ3iQZ aI9haXuncblSVra9p/SenB8orqzNqwU5Eoc6yqi1Fgj1qECB7wRMoJLvsqJFsBMd1bedN3 ClaQg+X7tn3jRHWxgPOtGJ95OJezEAEccbGfVNBGdjX+r7/UNWSm2/tRyRVWXQVIaPmnQq At8jF3EVrT3/vGcOxa4HF6JtVlZpCke7y7lrY5sLE+GzjtyZv2W/Bi800PMibQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692302314; 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=ev5whL04kMtWu3efabupViDXOiLchRr7tRTlsXsCr/8=; b=j74Mpnstb/exJhnhqt8oDPPUeQKmh1KUTB7T0MUcRhP8q2CHfV94zID2F3XbmmtQ4XE2jf wbLjuYlGNAfCGBlItwvnSUQ++lDcuox2Sh7FR+A0yEmaAcEuJin2B6wA/6CfSJpbPaTyI2 86xHhpiEGy3sg1SLdVLUkWWpe8kzN3jmGxNj/vm4WiZmdaaKzROXEuNpE5/+Ut4zLf+av3 P4L4qUasbh5kFroN1YS9eRP0eRAN5vHNwZIg0aCL7TtPQRo2vdPAAn1huUKTq7CkX+GB8E u7eIQ93o6qo9X5PcE/ivUonHJhdDsjgphdhYkcCVRlUZMI2qLpvDb8tlkxyvBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692302314; a=rsa-sha256; cv=none; b=I9x8Y0C3e72q62cgy8BeneaIjQMBLAMzxAkTsDwk+AP03BNe3CWy+g+cOI78jVPLTIuIbD +AlpGsekbY5wQdd9sCeBtzccVWxkfG0Rq9wR4DnWEY8Pa+JUahK5xIgG6H8kGWnDNMZpVG uoj4L587lvsGm1/fIuQYNDDjFwpm1hv0960Gv0Aj7rw9Ppu50kUOEraz/49r+0XOJNlhIk 97zMMzHkd/vpKJ9FKZtL1EfvL9zd0HxTEb1zRk9UciaFIhq+7Soti0pLPVWnMDf8Bju5xh osYlTOsqMekTwY9LWM/P63+xY3y9U4y4qx4Kyc0E8BIB5Eufi4zWSXJ3SyZHXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RRbRG1vNqzn60; Thu, 17 Aug 2023 19:58:34 +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 37HJwYjP080165; Thu, 17 Aug 2023 19:58:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37HJwYxd080162; Thu, 17 Aug 2023 19:58:34 GMT (envelope-from git) Date: Thu, 17 Aug 2023 19:58:34 GMT Message-Id: <202308171958.37HJwYxd080162@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 1f2b31f76e7d - main - linux(4): Add 2 Linux socket ioctl commands List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1f2b31f76e7d1ba591a4e7f4305c4acc2b1b4fa5 Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=1f2b31f76e7d1ba591a4e7f4305c4acc2b1b4fa5 commit 1f2b31f76e7d1ba591a4e7f4305c4acc2b1b4fa5 Author: Alvin Chen AuthorDate: 2023-08-17 19:57:16 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-17 19:57:16 +0000 linux(4): Add 2 Linux socket ioctl commands Support 2 Linux socket ioctl commands: SIOCGIFMETRIC, SIOCSIFMETRIC. Differential revision: https://reviews.freebsd.org/D39786 MFC after: 1 month --- sys/compat/linux/linux_ioctl.c | 6 ++++++ sys/compat/linux/linux_ioctl.h | 2 ++ 2 files changed, 8 insertions(+) diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c index 709f3ded977b..3b2727afd179 100644 --- a/sys/compat/linux/linux_ioctl.c +++ b/sys/compat/linux/linux_ioctl.c @@ -2272,6 +2272,12 @@ linux_ioctl_socket_ifreq(struct thread *td, int fd, u_int cmd, case LINUX_SIOCGIFHWADDR: cmd = SIOCGHWADDR; break; + case LINUX_SIOCGIFMETRIC: + cmd = SIOCGIFMETRIC; + break; + case LINUX_SIOCSIFMETRIC: + cmd = SIOCSIFMETRIC; + break; /* * XXX This is slightly bogus, but these ioctls are currently * XXX only used by the aironet (if_an) network driver. diff --git a/sys/compat/linux/linux_ioctl.h b/sys/compat/linux/linux_ioctl.h index 42c36e43db6c..8a56e35d10c6 100644 --- a/sys/compat/linux/linux_ioctl.h +++ b/sys/compat/linux/linux_ioctl.h @@ -235,6 +235,8 @@ #define LINUX_SIOCGIFBRDADDR 0x8919 #define LINUX_SIOCGIFNETMASK 0x891b #define LINUX_SIOCSIFNETMASK 0x891c +#define LINUX_SIOCGIFMETRIC 0x891d +#define LINUX_SIOCSIFMETRIC 0x891e #define LINUX_SIOCGIFMTU 0x8921 #define LINUX_SIOCSIFMTU 0x8922 #define LINUX_SIOCSIFNAME 0x8923