From nobody Mon Apr 24 14:12:09 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 4Q4nBd61xHz46tB6; Mon, 24 Apr 2023 14:12:09 +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 4Q4nBd5Y9Tz4KLw; Mon, 24 Apr 2023 14:12:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682345529; 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=yTPConXIgMUpXfVxBxZzAs97B3r5FKqq7l83SpbZStw=; b=lafrS6wZVO+N6c38fHQQwLGmdWY4VtVpIYb7nGTsrD+RihKaz1cCA8etHTT/wjnMXZ+Yh1 xo3I2ZoPMMPuqYZ8PT8b7iw19oqI4sgv+7300DSV0UNdfKW08NMdXNh0f7EsIAyro4V+Dr ELUrrstuJdT183W6HfU3DLSuDn+NR9EFau0vNuW9hRdX1qTluwhyd9L/AhFu5WHpXB7X16 ZR1ybqArRG3nzsm404Dk0B7lNfDotmxzLpZvBEm6jmOzirlpEzaInG81pFq87r1jtl7spk 1c2e/oIXp1KirCKFStGdMQx20EohOl94x/pVqyIEAfqYtIESImT0Xs/6iT0Pxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682345529; 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=yTPConXIgMUpXfVxBxZzAs97B3r5FKqq7l83SpbZStw=; b=Exx5IOLhdHV5/UBalWzQCG+fEJo8c/mcJRq4YuFCEXxxNDIvT50HheGyisxllrwW8gel9F JeJzqFhR6CkZCljoIu0zxaBRPOuG0og8u1suj6CQsrRxoDDNWXUugoXntMb253FmIJFQnd GCfaK07ZNRZpifYL/dzKQzilusbZMHUONPio8II3KG9jGDA7BZpNhE4Sw9WWgyaVWm3ITV LwkbNdxKlMSMiHKqB6gNZdhqDiDeyLYWSZKzuD1HoLXe1Pdc3XVLL5wPqKw3j3yq+0OXOD 60ZMAVxgeHblBY29Zk3LE4lV9mJY8Yw7p/lgHBLz7C7eL7YPCJN0wJFY/Zk/JA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682345529; a=rsa-sha256; cv=none; b=e8agcRnn5++lrmTcn0I5uD6A6tczSMAULEvGvvb/sHj1K7xMZVNOuHYrWUtRD7IoGHlayd +uv6hn56Vo5VGDBGiOSyCatB/l3y4fXUzwDl+954Trd85G7YMJUKH9tHsA0xOcTra2JE0j 5VOavnmxoGEJNJ1riAVxaAKXLGTOZjpmqzBulSlf5rjEWhGhwks6h/RRP+TqGkGZqcISIH z8SP2IYn/ilsdfREirdGf6tJnyZBurUSPqUsJ622pN9QVzh2wDPN8u9yE1KQFrZKvaMZdm zbJuGIYgnYbvoJfnt2NXgq89edLOEsugPfLGVeoho8jWeNCAqy3OJElngMDftQ== 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 4Q4nBd4dtRzT3q; Mon, 24 Apr 2023 14:12:09 +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 33OEC9uV034529; Mon, 24 Apr 2023 14:12:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33OEC9gi034528; Mon, 24 Apr 2023 14:12:09 GMT (envelope-from git) Date: Mon, 24 Apr 2023 14:12:09 GMT Message-Id: <202304241412.33OEC9gi034528@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: 97583aa25675 - main - linuxkpi: Migrate to IfAPI 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: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 97583aa2567589cb83540d2d9de1980b76db9a99 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=97583aa2567589cb83540d2d9de1980b76db9a99 commit 97583aa2567589cb83540d2d9de1980b76db9a99 Author: Justin Hibbits AuthorDate: 2023-04-03 14:48:28 +0000 Commit: Justin Hibbits CommitDate: 2023-04-24 13:54:22 +0000 linuxkpi: Migrate to IfAPI Summary: Trivial changes for LinuxKPI to use IfAPI. The 'bsdifp' looks unused, so removed it instead of converting it to a pointer. Bump __FreeBSD_version for change to struct net_device. Reviewed by: bz, hselasky Sponsored by: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D39491 --- sys/compat/linuxkpi/common/include/linux/if_vlan.h | 2 +- sys/compat/linuxkpi/common/include/linux/netdevice.h | 3 --- sys/sys/param.h | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/if_vlan.h b/sys/compat/linuxkpi/common/include/linux/if_vlan.h index 7c5531f6ec11..2cbb9b7e0b54 100644 --- a/sys/compat/linuxkpi/common/include/linux/if_vlan.h +++ b/sys/compat/linuxkpi/common/include/linux/if_vlan.h @@ -44,7 +44,7 @@ static inline int is_vlan_dev(struct ifnet *ifp) { - return (ifp->if_type == IFT_L2VLAN); + return (if_gettype(ifp) == IFT_L2VLAN); } static inline uint16_t diff --git a/sys/compat/linuxkpi/common/include/linux/netdevice.h b/sys/compat/linuxkpi/common/include/linux/netdevice.h index 8653b5df68bd..1093f3cff080 100644 --- a/sys/compat/linuxkpi/common/include/linux/netdevice.h +++ b/sys/compat/linuxkpi/common/include/linux/netdevice.h @@ -106,9 +106,6 @@ struct net_device_ops { }; struct net_device { - /* BSD specific for compat. */ - struct ifnet bsdifp; - /* net_device fields seen publicly. */ /* XXX can we later make some aliases to ifnet? */ char name[IFNAMSIZ]; diff --git a/sys/sys/param.h b/sys/sys/param.h index b6bbe545a5b1..25fac3efde1d 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -76,7 +76,7 @@ * cannot include sys/param.h and should only be updated here. */ #undef __FreeBSD_version -#define __FreeBSD_version 1400087 +#define __FreeBSD_version 1400088 /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,