From owner-dev-commits-src-main@freebsd.org Thu May 27 12:39:25 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 85D5D63C4A2; Thu, 27 May 2021 12:39:25 +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 4FrS7K19jSz3M7L; Thu, 27 May 2021 12:39:25 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 D802124333; Thu, 27 May 2021 12:39:24 +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 14RCdOuG034050; Thu, 27 May 2021 12:39:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14RCdOB9034049; Thu, 27 May 2021 12:39:24 GMT (envelope-from git) Date: Thu, 27 May 2021 12:39:24 GMT Message-Id: <202105271239.14RCdOB9034049@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 9b6835f3ab7f - main - LinuxKPI: netdevice.h remove more ifnet operating macros MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9b6835f3ab7f05728caeaaa2ade09e80f1c5e825 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 May 2021 12:39:25 -0000 The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=9b6835f3ab7f05728caeaaa2ade09e80f1c5e825 commit 9b6835f3ab7f05728caeaaa2ade09e80f1c5e825 Author: Bjoern A. Zeeb AuthorDate: 2021-05-26 17:55:21 +0000 Commit: Bjoern A. Zeeb CommitDate: 2021-05-27 12:26:01 +0000 LinuxKPI: netdevice.h remove more ifnet operating macros Now that mlx4 and ofed either are operating on ifnet functions directly or have a private copy of these macros, we can remove them from linux/netdevice.h. With this only the #define for net_device to ifnet is left. Sponsored by: The FreeBSD Foundation MFC after: 12 days Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D30478 --- sys/compat/linuxkpi/common/include/linux/netdevice.h | 9 --------- 1 file changed, 9 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/netdevice.h b/sys/compat/linuxkpi/common/include/linux/netdevice.h index 07c111cc4fc9..faff2fde5f32 100644 --- a/sys/compat/linuxkpi/common/include/linux/netdevice.h +++ b/sys/compat/linuxkpi/common/include/linux/netdevice.h @@ -53,15 +53,6 @@ #define net_device ifnet -#define dev_hold(d) if_ref(d) -#define dev_put(d) if_rele(d) -#define dev_net(d) ((d)->if_vnet) - -#define net_eq(a,b) ((a) == (b)) - -#define netif_running(dev) !!((dev)->if_drv_flags & IFF_DRV_RUNNING) -#define netif_carrier_ok(dev) ((dev)->if_link_state == LINK_STATE_UP) - #define rtnl_lock() #define rtnl_unlock()