From owner-svn-src-stable-12@freebsd.org  Mon Mar 16 23:36:33 2020
Return-Path: <owner-svn-src-stable-12@freebsd.org>
Delivered-To: svn-src-stable-12@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 C2D4B273980;
 Mon, 16 Mar 2020 23:36:33 +0000 (UTC)
 (envelope-from brooks@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)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 48hCPF2pnVz4S46;
 Mon, 16 Mar 2020 23:36:33 +0000 (UTC)
 (envelope-from brooks@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 3EE07392;
 Mon, 16 Mar 2020 23:36:33 +0000 (UTC)
 (envelope-from brooks@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02GNaXmC064580;
 Mon, 16 Mar 2020 23:36:33 GMT (envelope-from brooks@FreeBSD.org)
Received: (from brooks@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02GNaXnE064579;
 Mon, 16 Mar 2020 23:36:33 GMT (envelope-from brooks@FreeBSD.org)
Message-Id: <202003162336.02GNaXnE064579@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: brooks set sender to
 brooks@FreeBSD.org using -f
From: Brooks Davis <brooks@FreeBSD.org>
Date: Mon, 16 Mar 2020 23:36:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org
Subject: svn commit: r359027 - stable/12/sys/dev/mxge
X-SVN-Group: stable-12
X-SVN-Commit-Author: brooks
X-SVN-Commit-Paths: stable/12/sys/dev/mxge
X-SVN-Commit-Revision: 359027
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-12@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for only the 12-stable src tree
 <svn-src-stable-12.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-12>, 
 <mailto:svn-src-stable-12-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-12/>
List-Post: <mailto:svn-src-stable-12@freebsd.org>
List-Help: <mailto:svn-src-stable-12-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-12>, 
 <mailto:svn-src-stable-12-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Mar 2020 23:36:33 -0000

Author: brooks
Date: Mon Mar 16 23:36:32 2020
New Revision: 359027
URL: https://svnweb.freebsd.org/changeset/base/359027

Log:
  MFC r358593:
  
  Use ifr_data_get_ptr() consistently.
  
  Obtained from:	CheriBSD
  Sponsored by:	DARPA

Modified:
  stable/12/sys/dev/mxge/if_mxge.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/dev/mxge/if_mxge.c
==============================================================================
--- stable/12/sys/dev/mxge/if_mxge.c	Mon Mar 16 23:29:03 2020	(r359026)
+++ stable/12/sys/dev/mxge/if_mxge.c	Mon Mar 16 23:36:32 2020	(r359027)
@@ -4349,7 +4349,7 @@ mxge_ioctl(struct ifnet *ifp, u_long command, caddr_t 
 		err = mxge_fetch_i2c(sc, &i2c);
 		mtx_unlock(&sc->driver_mtx);
 		if (err == 0)
-			err = copyout(&i2c, ifr->ifr_ifru.ifru_data,
+			err = copyout(&i2c, ifr_data_get_ptr(ifr),
 			    sizeof(i2c));
 		break;
 	default: