From owner-svn-soc-all@freebsd.org  Mon Jul 18 09:11:13 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 A18FAB9C937
 for <svn-soc-all@mailman.ysv.freebsd.org>;
 Mon, 18 Jul 2016 09:11:13 +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 923A51F9D
 for <svn-soc-all@FreeBSD.org>; Mon, 18 Jul 2016 09:11:13 +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 u6I9BDYP028574
 for <svn-soc-all@FreeBSD.org>; Mon, 18 Jul 2016 09:11:13 GMT
 (envelope-from vincenzo@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id u6I9BCRY027913
 for svn-soc-all@FreeBSD.org; Mon, 18 Jul 2016 09:11:12 GMT
 (envelope-from vincenzo@FreeBSD.org)
Date: Mon, 18 Jul 2016 09:11:12 GMT
Message-Id: <201607180911.u6I9BCRY027913@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: r306425 - 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:11:13 -0000

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

Log:
   freebsd: ptnet_transmit: don't drain queue in POLLING mode

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 18 09:09:57 2016	(r306424)
+++ soc2016/vincenzo/head/sys/dev/netmap/if_ptnet.c	Mon Jul 18 09:11:12 2016	(r306425)
@@ -1921,6 +1921,12 @@
 		return err;
 	}
 
+	if (ifp->if_capenable & IFCAP_POLLING) {
+		/* If polling is on, the transmit queues will be
+		 * drained by the poller. */
+		return 0;
+	}
+
 	err = ptnet_drain_transmit_queue(pq, PTNET_TX_BUDGET, true);
 
 	return (err < 0) ? err : 0;