From owner-svn-soc-all@freebsd.org  Mon Jul  4 07:44:04 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 E081FB91D1D
 for <svn-soc-all@mailman.ysv.freebsd.org>;
 Mon,  4 Jul 2016 07:44:04 +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 CBB06262E
 for <svn-soc-all@FreeBSD.org>; Mon,  4 Jul 2016 07:44:04 +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 u647i4f7051043
 for <svn-soc-all@FreeBSD.org>; Mon, 4 Jul 2016 07:44:04 GMT
 (envelope-from vincenzo@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id u647i4nH051010
 for svn-soc-all@FreeBSD.org; Mon, 4 Jul 2016 07:44:04 GMT
 (envelope-from vincenzo@FreeBSD.org)
Date: Mon, 4 Jul 2016 07:44:04 GMT
Message-Id: <201607040744.u647i4nH051010@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: r305713 - 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, 04 Jul 2016 07:44:05 -0000

Author: vincenzo
Date: Mon Jul  4 07:44:03 2016
New Revision: 305713
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=305713

Log:
   freebsd: ptnet_transmit: support VLAN encapsulation

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

Modified: soc2016/vincenzo/head/sys/dev/netmap/if_ptnet.c
==============================================================================
--- soc2016/vincenzo/head/sys/dev/netmap/if_ptnet.c	Mon Jul  4 07:43:54 2016	(r305712)
+++ soc2016/vincenzo/head/sys/dev/netmap/if_ptnet.c	Mon Jul  4 07:44:03 2016	(r305713)
@@ -1327,6 +1327,15 @@
 
 	DBG(device_printf(sc->dev, "transmit %p\n", m));
 
+	/* Insert 802.1Q header if needed. */
+	if (m->m_flags & M_VLANTAG) {
+		m = ether_vlanencap(m, m->m_pkthdr.ether_vtag);
+		if (m == NULL) {
+			return ENOBUFS;
+		}
+		m->m_flags &= ~M_VLANTAG;
+	}
+
 	/* Get the flow-id if available. */
 	queue_idx = (M_HASHTYPE_GET(m) != M_HASHTYPE_NONE) ?
 		    m->m_pkthdr.flowid : curcpu;