From owner-svn-ports-head@FreeBSD.ORG  Wed Jan 28 01:30:58 2015
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id BDC4AC10;
 Wed, 28 Jan 2015 01:30:58 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A9FB6BBA;
 Wed, 28 Jan 2015 01:30:58 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0S1UwQO092230;
 Wed, 28 Jan 2015 01:30:58 GMT (envelope-from fjoe@FreeBSD.org)
Received: (from fjoe@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0S1UwZ2092229;
 Wed, 28 Jan 2015 01:30:58 GMT (envelope-from fjoe@FreeBSD.org)
Message-Id: <201501280130.t0S1UwZ2092229@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: fjoe set sender to fjoe@FreeBSD.org
 using -f
From: Max Khon <fjoe@FreeBSD.org>
Date: Wed, 28 Jan 2015 01:30:58 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r378034 - head/net/vblade/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 28 Jan 2015 01:30:58 -0000

Author: fjoe
Date: Wed Jan 28 01:30:57 2015
New Revision: 378034
URL: https://svnweb.freebsd.org/changeset/ports/378034
QAT: https://qat.redports.org/buildarchive/r378034/

Log:
  Unbreak on -CURRENT: Use DIOCGMEDIASIZE instead of DIOCGDINFO.

Added:
  head/net/vblade/files/patch-freebsd.c   (contents, props changed)

Added: head/net/vblade/files/patch-freebsd.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/vblade/files/patch-freebsd.c	Wed Jan 28 01:30:57 2015	(r378034)
@@ -0,0 +1,29 @@
+--- freebsd.c.orig	2015-01-28 07:26:22.000000000 +0600
++++ freebsd.c	2015-01-28 07:29:23.000000000 +0600
+@@ -25,7 +25,7 @@
+ #include <sys/types.h>
+ #include <net/if.h>
+ #include <sys/stat.h>
+-#include <sys/disklabel.h>
++#include <sys/disk.h>
+ #include <sys/select.h>
+ #include <sys/sysctl.h>
+ 
+@@ -267,14 +267,14 @@
+ vlong
+ getsize(int fd)
+ {
++	off_t media_size;
+ 	vlong size;
+ 	struct stat s;
+ 	int n;
+-	struct disklabel lab;
+ 
+ 	// Try getting disklabel from block dev
+-	if ((n = ioctl(fd, DIOCGDINFO, lab)) != -1) {  
+-		size = lab.d_secsize * lab.d_secperunit;
++	if ((n = ioctl(fd, DIOCGMEDIASIZE, &media_size)) != -1) {  
++		size = media_size;
+ 	} else {
+ 		// must not be a block special dev
+ 		if (fstat(fd, &s) == -1) {