From owner-svn-soc-all@freebsd.org  Mon Jul 18 09:06:21 2016
Return-Path: <owner-svn-soc-all@freebsd.org>
Delivered-To: svn-soc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 571FBB9C5FB
 for <svn-soc-all@mailman.ysv.freebsd.org>;
 Mon, 18 Jul 2016 09:06:21 +0000 (UTC)
 (envelope-from vincenzo@FreeBSD.org)
Received: from socsvn.freebsd.org (socsvn.freebsd.org
 [IPv6:2001:1900:2254:206a::50:2])
 (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 462891D5C
 for <svn-soc-all@FreeBSD.org>; Mon, 18 Jul 2016 09:06:21 +0000 (UTC)
 (envelope-from vincenzo@FreeBSD.org)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.15.2/8.15.2) with ESMTP id u6I96LNg001127
 for <svn-soc-all@FreeBSD.org>; Mon, 18 Jul 2016 09:06:21 GMT
 (envelope-from vincenzo@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id u6I96KVo000697
 for svn-soc-all@FreeBSD.org; Mon, 18 Jul 2016 09:06:20 GMT
 (envelope-from vincenzo@FreeBSD.org)
Date: Mon, 18 Jul 2016 09:06:20 GMT
Message-Id: <201607180906.u6I96KVo000697@socsvn.freebsd.org>
X-Authentication-Warning: socsvn.freebsd.org: www set sender to
 vincenzo@FreeBSD.org using -f
From: vincenzo@FreeBSD.org
To: svn-soc-all@FreeBSD.org
Subject: socsvn commit: r306410 - soc2016/vincenzo/head/sys/dev/netmap
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all/>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 18 Jul 2016 09:06:21 -0000

Author: vincenzo
Date: Mon Jul 18 09:06:19 2016
New Revision: 306410
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=306410

Log:
   freebsd: ptnet: add ptnet_vnet_hdr parameter

Modified:
  soc2016/vincenzo/head/sys/dev/netmap/if_ptnet.c
  soc2016/vincenzo/head/sys/dev/netmap/netmap.c

Modified: soc2016/vincenzo/head/sys/dev/netmap/if_ptnet.c
==============================================================================
--- soc2016/vincenzo/head/sys/dev/netmap/if_ptnet.c	Mon Jul 18 09:06:09 2016	(r306409)
+++ soc2016/vincenzo/head/sys/dev/netmap/if_ptnet.c	Mon Jul 18 09:06:19 2016	(r306410)
@@ -98,9 +98,7 @@
 #define DBG(x)
 #endif  /* !DEBUG */
 
-/* Tunable parameters. */
-static int ptnet_vnet_hdr = 0;
-TUNABLE_INT("hw.ptnet.vnet_hdr", &ptnet_vnet_hdr);
+extern int ptnet_vnet_hdr; /* Tunable parameter */
 
 struct ptnet_softc;
 

Modified: soc2016/vincenzo/head/sys/dev/netmap/netmap.c
==============================================================================
--- soc2016/vincenzo/head/sys/dev/netmap/netmap.c	Mon Jul 18 09:06:09 2016	(r306409)
+++ soc2016/vincenzo/head/sys/dev/netmap/netmap.c	Mon Jul 18 09:06:19 2016	(r306410)
@@ -516,6 +516,9 @@
 int netmap_generic_ringsize = 1024;
 int netmap_generic_rings = 1;
 
+/* Let ptnet devices use virtio-net headers. */
+int ptnet_vnet_hdr = 0;
+
 /*
  * SYSCTL calls are grouped between SYSBEGIN and SYSEND to be emulated
  * in some other operating systems
@@ -543,6 +546,7 @@
 SYSCTL_INT(_dev_netmap, OID_AUTO, generic_ringsize, CTLFLAG_RW, &netmap_generic_ringsize, 0 , "");
 SYSCTL_INT(_dev_netmap, OID_AUTO, generic_rings, CTLFLAG_RW, &netmap_generic_rings, 0 , "");
 SYSCTL_INT(_dev_netmap, OID_AUTO, generic_txqdisc, CTLFLAG_RW, &netmap_generic_txqdisc, 0 , "");
+SYSCTL_INT(_dev_netmap, OID_AUTO, ptnet_vnet_hdr, CTLFLAG_RW, &ptnet_vnet_hdr, 0 , "");
 
 SYSEND;