Date: Sat, 14 Feb 2015 19:18:56 +0000 (UTC) From: Luigi Rizzo <luigi@FreeBSD.org> 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 Message-ID: <201502141918.t1EJIubG025393@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502141918.t1EJIubG025393>