From owner-svn-src-stable@FreeBSD.ORG  Sat Feb 14 19:18:57 2015
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 24F13F85;
 Sat, 14 Feb 2015 19:18:57 +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 0F8A4A2A;
 Sat, 14 Feb 2015 19:18:57 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1EJIuaQ025394;
 Sat, 14 Feb 2015 19:18:56 GMT (envelope-from luigi@FreeBSD.org)
Received: (from luigi@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1EJIubG025393;
 Sat, 14 Feb 2015 19:18:56 GMT (envelope-from luigi@FreeBSD.org)
Message-Id: <201502141918.t1EJIubG025393@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: luigi set sender to
 luigi@FreeBSD.org using -f
From: Luigi Rizzo <luigi@FreeBSD.org>
Date: Sat, 14 Feb 2015 19:18:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r278775 - stable/10/sys/net
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 14 Feb 2015 19:18:57 -0000

Author: luigi
Date: Sat Feb 14 19:18:56 2015
New Revision: 278775
URL: https://svnweb.freebsd.org/changeset/base/278775

Log:
  sync with the version in head (r274338):
  fix one comment, and return kernel-supplied error if available.
  no API changes.

Modified:
  stable/10/sys/net/netmap_user.h

Modified: stable/10/sys/net/netmap_user.h
==============================================================================
--- stable/10/sys/net/netmap_user.h	Sat Feb 14 19:03:11 2015	(r278774)
+++ stable/10/sys/net/netmap_user.h	Sat Feb 14 19:18:56 2015	(r278775)
@@ -40,7 +40,7 @@
  * From there:
  *	struct netmap_ring *NETMAP_TXRING(nifp, index)
  *	struct netmap_ring *NETMAP_RXRING(nifp, index)
- *		we can access ring->nr_cur, ring->nr_avail, ring->nr_flags
+ *		we can access ring->cur, ring->head, ring->tail, etc.
  *
  *	ring->slot[i] gives us the i-th slot (we can access
  *		directly len, flags, buf_idx)
@@ -543,7 +543,8 @@ fail:
 	nm_close(d);
 	if (errmsg)
 		D("%s %s", errmsg, ifname);
-	errno = EINVAL;
+	if (errno == 0)
+		errno = EINVAL;
 	return NULL;
 }