From owner-svn-src-head@freebsd.org  Thu Jun 14 07:55:11 2018
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 701B2100D194;
 Thu, 14 Jun 2018 07:55:11 +0000 (UTC)
 (envelope-from hselasky@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 269817B492;
 Thu, 14 Jun 2018 07:55:11 +0000 (UTC)
 (envelope-from hselasky@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 08C3625A03;
 Thu, 14 Jun 2018 07:55:11 +0000 (UTC)
 (envelope-from hselasky@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5E7tAb2004568;
 Thu, 14 Jun 2018 07:55:10 GMT (envelope-from hselasky@FreeBSD.org)
Received: (from hselasky@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5E7tAQ3004567;
 Thu, 14 Jun 2018 07:55:10 GMT (envelope-from hselasky@FreeBSD.org)
Message-Id: <201806140755.w5E7tAQ3004567@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: hselasky set sender to
 hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
Date: Thu, 14 Jun 2018 07:55:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r335123 - head/sys/ofed/drivers/infiniband/core
X-SVN-Group: head
X-SVN-Commit-Author: hselasky
X-SVN-Commit-Paths: head/sys/ofed/drivers/infiniband/core
X-SVN-Commit-Revision: 335123
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.26
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 14 Jun 2018 07:55:11 -0000

Author: hselasky
Date: Thu Jun 14 07:55:10 2018
New Revision: 335123
URL: https://svnweb.freebsd.org/changeset/base/335123

Log:
  Revert r335094 and properly fix OFED build after r335053.
  
  MFC after:	1 week
  Sponsored by:	Mellanox Technologies

Modified:
  head/sys/ofed/drivers/infiniband/core/ib_user_mad.c

Modified: head/sys/ofed/drivers/infiniband/core/ib_user_mad.c
==============================================================================
--- head/sys/ofed/drivers/infiniband/core/ib_user_mad.c	Thu Jun 14 07:12:30 2018	(r335122)
+++ head/sys/ofed/drivers/infiniband/core/ib_user_mad.c	Thu Jun 14 07:55:10 2018	(r335123)
@@ -130,8 +130,7 @@ struct ib_umad_packet {
 
 static struct class *umad_class;
 
-#define IBMKDEV(x, y)  (((dev_t)(x) << 32) | (unsigned)(y))
-static const dev_t base_dev = IBMKDEV(IB_UMAD_MAJOR, IB_UMAD_MINOR_BASE);
+#define	base_dev MKDEV(IB_UMAD_MAJOR, IB_UMAD_MINOR_BASE)
 
 static DEFINE_SPINLOCK(port_lock);
 static DECLARE_BITMAP(dev_map, IB_UMAD_MAX_PORTS);