From nobody Sat Mar 4 09:12:45 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 4PTJyj4TPgz3vnCm; Sat, 4 Mar 2023 09:12:45 +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 4PTJyj34s3z3yB2; Sat, 4 Mar 2023 09:12:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677921165; 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=WyRfQRTtS8JRcohjHbQZCM3Eh+zl3fBNHoIe+VHUYrs=; b=pcobdkiUehKPMx8oa8jcTUr1BfBdyY5OVFa/E5owo4YoCkU3qz9bC6Mt4aup2PnaqwlURU heTff/WJ2GTXc42s4V0VCMzBKevyYtX6DgP8QgJ5S7O8bGSdvcN1bqB3kzMIio3BqN5/Sg duX6dk8iouiGohmOwklt90zi0f0QhWP+sF3tm586CidygX1zyUE4vPXPxwSyAOLYMt7N+c HbkudvI9Zwft6ENNaRUiDEZDBWcKZLRSFsZQsjcSeEX/Xod7LESJfwH/3H3VrI3s3bcUyV v+kD1+w6eaX4NzKzguJiMyGORyzhgq4u6poHwbPBcPp7krBCy0YrK7AkeDzFJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677921165; 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=WyRfQRTtS8JRcohjHbQZCM3Eh+zl3fBNHoIe+VHUYrs=; b=JZeHSsv9igtKL897rylHhEuTKWUW/7s/C++dQ4W1zEYO59J9xPykS5rQ78ZeuwGE/pgSDI GiyJaaB/SbzKkJPe0XdMkwR4tUaXP4Xo1eXkTgrzg1rAaYBTxZPHg8uJ6DNaWwsK6b28Ja 0p0mVN7zWZWXLiRC/gE711hMwlbRwgn5D0x7U2vaJvJAZeT9B1PHKf+m+alfKoX0AwM+xU QSz0aBjhTDJhchSPltIxthy6UUCr70v+yHlDthKw8AfhGgBml4rHsdsJm7uNalhaRFvvNj XEDmohj9Ldjy2Gi8e5S0fpwi2GAEgq/50YrfTYbOIVupWBZDt37aCqSuyylsFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677921165; a=rsa-sha256; cv=none; b=BJr3iITT67/q/JlKiqWMFhJkzXKUe1Hwwi1MARxDTWmSXkHiBrd6FX7jdXKER1ir5SH7Vw G7O/B7XBqVa8eFzVUDJLHsSKRLmHKlzOvTcyy+WJC6bxilOwfHl7DBP2V1hdBL4Zborz+2 7yLfB2Rx6dBjzeKJw2ckE9+PzMX2vDFAJQTVRZi6tAUQQ5JVVUlECHklMWMqLacSSBxSNx 8wAjJ9j40oX5l5/lcpknF6vYJfQgw5wjpQBcBHr8PtB2/TuMMEFpu5LvFaXIb2aT2q9el5 UkEL5KFKO4x5p7lQ6LXZ83uENIleVbm4kcEMBu7cNsJriTref1uYxHBU5PVfNA== 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 4PTJyj1YzczZ8R; Sat, 4 Mar 2023 09:12:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 3249CjaC078854; Sat, 4 Mar 2023 09:12:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3249CjSZ078853; Sat, 4 Mar 2023 09:12:45 GMT (envelope-from git) Date: Sat, 4 Mar 2023 09:12:45 GMT Message-Id: <202303040912.3249CjSZ078853@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: cabbfb60d050 - main - linux(4): Reduce code duplication between MD files 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: cabbfb60d050f21eda60fb7d9a95718059048686 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=cabbfb60d050f21eda60fb7d9a95718059048686 commit cabbfb60d050f21eda60fb7d9a95718059048686 Author: Dmitry Chagin AuthorDate: 2023-03-04 09:11:38 +0000 Commit: Dmitry Chagin CommitDate: 2023-03-04 09:11:38 +0000 linux(4): Reduce code duplication between MD files Move struct ifnet definitions under compat/linux. Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D38791 --- sys/amd64/linux/linux.h | 34 ---------------------------------- sys/amd64/linux32/linux.h | 34 ---------------------------------- sys/arm64/linux/linux.h | 34 ---------------------------------- sys/compat/linux/linux_socket.h | 35 +++++++++++++++++++++++++++++++++++ sys/i386/linux/linux.h | 33 --------------------------------- 5 files changed, 35 insertions(+), 135 deletions(-) diff --git a/sys/amd64/linux/linux.h b/sys/amd64/linux/linux.h index b31b520cb573..09125576d33a 100644 --- a/sys/amd64/linux/linux.h +++ b/sys/amd64/linux/linux.h @@ -224,40 +224,6 @@ union l_semun { l_uintptr_t __pad; }; -struct l_ifmap { - l_ulong mem_start; - l_ulong mem_end; - l_ushort base_addr; - u_char irq; - u_char dma; - u_char port; - /* 3 bytes spare */ -}; - -struct l_ifreq { - union { - char ifrn_name[LINUX_IFNAMSIZ]; - } ifr_ifrn; - - union { - struct l_sockaddr ifru_addr; - struct l_sockaddr ifru_dstaddr; - struct l_sockaddr ifru_broadaddr; - struct l_sockaddr ifru_netmask; - struct l_sockaddr ifru_hwaddr; - l_short ifru_flags[1]; - l_int ifru_ivalue; - l_int ifru_mtu; - struct l_ifmap ifru_map; - char ifru_slave[LINUX_IFNAMSIZ]; - l_uintptr_t ifru_data; - } ifr_ifru; -}; - -#define ifr_name ifr_ifrn.ifrn_name /* Interface name */ -#define ifr_hwaddr ifr_ifru.ifru_hwaddr /* MAC address */ -#define ifr_ifindex ifr_ifru.ifru_ivalue /* Interface index */ - struct l_ifconf { int ifc_len; union { diff --git a/sys/amd64/linux32/linux.h b/sys/amd64/linux32/linux.h index c77897344506..9beee0b7079c 100644 --- a/sys/amd64/linux32/linux.h +++ b/sys/amd64/linux32/linux.h @@ -304,40 +304,6 @@ union l_semun { l_uintptr_t __pad; }; -struct l_ifmap { - l_ulong mem_start; - l_ulong mem_end; - l_ushort base_addr; - u_char irq; - u_char dma; - u_char port; - /* 3 bytes spare */ -}; - -struct l_ifreq { - union { - char ifrn_name[LINUX_IFNAMSIZ]; - } ifr_ifrn; - - union { - struct l_sockaddr ifru_addr; - struct l_sockaddr ifru_dstaddr; - struct l_sockaddr ifru_broadaddr; - struct l_sockaddr ifru_netmask; - struct l_sockaddr ifru_hwaddr; - l_short ifru_flags[1]; - l_int ifru_ivalue; - l_int ifru_mtu; - struct l_ifmap ifru_map; - char ifru_slave[LINUX_IFNAMSIZ]; - l_uintptr_t ifru_data; - } ifr_ifru; -}; - -#define ifr_name ifr_ifrn.ifrn_name /* Interface name */ -#define ifr_hwaddr ifr_ifru.ifru_hwaddr /* MAC address */ -#define ifr_ifindex ifr_ifru.ifru_ivalue /* Interface index */ - struct l_ifconf { int ifc_len; union { diff --git a/sys/arm64/linux/linux.h b/sys/arm64/linux/linux.h index 8ecadff2e220..5c95acd86771 100644 --- a/sys/arm64/linux/linux.h +++ b/sys/arm64/linux/linux.h @@ -181,40 +181,6 @@ union l_semun { l_uintptr_t __pad; }; -struct l_ifmap { - l_ulong mem_start; - l_ulong mem_end; - l_ushort base_addr; - u_char irq; - u_char dma; - u_char port; - /* 3 bytes spare*/ -}; - -struct l_ifreq { - union { - char ifrn_name[LINUX_IFNAMSIZ]; - } ifr_ifrn; - - union { - struct l_sockaddr ifru_addr; - struct l_sockaddr ifru_dstaddr; - struct l_sockaddr ifru_broadaddr; - struct l_sockaddr ifru_netmask; - struct l_sockaddr ifru_hwaddr; - l_short ifru_flags[1]; - l_int ifru_ivalue; - l_int ifru_mtu; - struct l_ifmap ifru_map; - char ifru_slave[LINUX_IFNAMSIZ]; - l_uintptr_t ifru_data; - } ifr_ifru; -}; - -#define ifr_name ifr_ifrn.ifrn_name /* Interface name */ -#define ifr_hwaddr ifr_ifru.ifru_hwaddr /* MAC address */ -#define ifr_ifindex ifr_ifru.ifru_ivalue /* Interface index */ - #define linux_copyout_rusage(r, u) copyout(r, u, sizeof(*r)) struct linux_pt_regset { diff --git a/sys/compat/linux/linux_socket.h b/sys/compat/linux/linux_socket.h index 74b96fbb9c11..9b332a7a9b86 100644 --- a/sys/compat/linux/linux_socket.h +++ b/sys/compat/linux/linux_socket.h @@ -326,4 +326,39 @@ int linux_accept(struct thread *td, struct linux_accept_args *args); #define LINUX_TCP_INFO 11 #define LINUX_TCP_MD5SIG 14 +struct l_ifmap { + l_ulong mem_start; + l_ulong mem_end; + l_ushort base_addr; + u_char irq; + u_char dma; + u_char port; + /* 3 bytes spare */ +}; + +struct l_ifreq { + union { + char ifrn_name[LINUX_IFNAMSIZ]; + } ifr_ifrn; + + union { + struct l_sockaddr ifru_addr; + struct l_sockaddr ifru_dstaddr; + struct l_sockaddr ifru_broadaddr; + struct l_sockaddr ifru_netmask; + struct l_sockaddr ifru_hwaddr; + l_short ifru_flags[1]; + l_int ifru_ivalue; + l_int ifru_mtu; + struct l_ifmap ifru_map; + char ifru_slave[LINUX_IFNAMSIZ]; + char ifru_newname[LINUX_IFNAMSIZ]; + l_uintptr_t ifru_data; + } ifr_ifru; +}; + +#define ifr_name ifr_ifrn.ifrn_name /* Interface name */ +#define ifr_hwaddr ifr_ifru.ifru_hwaddr /* MAC address */ +#define ifr_ifindex ifr_ifru.ifru_ivalue /* Interface index */ + #endif /* _LINUX_SOCKET_H_ */ diff --git a/sys/i386/linux/linux.h b/sys/i386/linux/linux.h index 43bf3ca126b6..7810f8d29ccd 100644 --- a/sys/i386/linux/linux.h +++ b/sys/i386/linux/linux.h @@ -279,39 +279,6 @@ union l_semun { l_uintptr_t __pad; }; -struct l_ifmap { - l_ulong mem_start; - l_ulong mem_end; - l_ushort base_addr; - u_char irq; - u_char dma; - u_char port; -}; - -struct l_ifreq { - union { - char ifrn_name[LINUX_IFNAMSIZ]; - } ifr_ifrn; - - union { - struct l_sockaddr ifru_addr; - struct l_sockaddr ifru_dstaddr; - struct l_sockaddr ifru_broadaddr; - struct l_sockaddr ifru_netmask; - struct l_sockaddr ifru_hwaddr; - l_short ifru_flags[1]; - l_int ifru_ivalue; - l_int ifru_mtu; - struct l_ifmap ifru_map; - char ifru_slave[LINUX_IFNAMSIZ]; - l_caddr_t ifru_data; - } ifr_ifru; -}; - -#define ifr_name ifr_ifrn.ifrn_name /* Interface name */ -#define ifr_hwaddr ifr_ifru.ifru_hwaddr /* MAC address */ -#define ifr_ifindex ifr_ifru.ifru_ivalue /* Interface index */ - struct l_user_desc { l_uint entry_number; l_uint base_addr;