From owner-svn-soc-all@freebsd.org Fri Aug 5 16:46:09 2016 Return-Path: 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 454A0BB069B for ; Fri, 5 Aug 2016 16:46:09 +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 1FB361A97 for ; Fri, 5 Aug 2016 16:46:09 +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 u75Gk8nN090138 for ; Fri, 5 Aug 2016 16:46:08 GMT (envelope-from vincenzo@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id u75Gk8jB090133 for svn-soc-all@FreeBSD.org; Fri, 5 Aug 2016 16:46:08 GMT (envelope-from vincenzo@FreeBSD.org) Date: Fri, 5 Aug 2016 16:46:08 GMT Message-Id: <201608051646.u75Gk8jB090133@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: r307252 - in soc2016/vincenzo/head/sys: conf 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Aug 2016 16:46:09 -0000 Author: vincenzo Date: Fri Aug 5 16:46:07 2016 New Revision: 307252 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=307252 Log: netmap: update files and fix if_ptnet KASSERT calls Modified: soc2016/vincenzo/head/sys/conf/files soc2016/vincenzo/head/sys/dev/netmap/if_ptnet.c Modified: soc2016/vincenzo/head/sys/conf/files ============================================================================== --- soc2016/vincenzo/head/sys/conf/files Fri Aug 5 16:11:11 2016 (r307251) +++ soc2016/vincenzo/head/sys/conf/files Fri Aug 5 16:46:07 2016 (r307252) @@ -2117,6 +2117,7 @@ dev/ncr/ncr.c optional ncr pci dev/ncv/ncr53c500.c optional ncv dev/ncv/ncr53c500_pccard.c optional ncv pccard +dev/netmap/if_ptnet.c optional netmap dev/netmap/netmap.c optional netmap dev/netmap/netmap_freebsd.c optional netmap dev/netmap/netmap_generic.c optional netmap @@ -2126,6 +2127,7 @@ dev/netmap/netmap_offloadings.c optional netmap dev/netmap/netmap_pipe.c optional netmap dev/netmap/netmap_vale.c optional netmap +dev/netmap/ptnetmap.c optional netmap # compile-with "${NORMAL_C} -Wconversion -Wextra" dev/nfsmb/nfsmb.c optional nfsmb pci dev/nge/if_nge.c optional nge Modified: soc2016/vincenzo/head/sys/dev/netmap/if_ptnet.c ============================================================================== --- soc2016/vincenzo/head/sys/dev/netmap/if_ptnet.c Fri Aug 5 16:11:11 2016 (r307251) +++ soc2016/vincenzo/head/sys/dev/netmap/if_ptnet.c Fri Aug 5 16:46:07 2016 (r307252) @@ -883,7 +883,7 @@ nm_buf_size = NETMAP_BUF_SIZE(na_dr); - KASSERT(nm_buf_size > 0, "Invalid netmap buffer size"); + KASSERT(nm_buf_size > 0, ("Invalid netmap buffer size")); sc->min_tx_space = PTNET_MAX_PKT_SIZE / nm_buf_size + 2; device_printf(sc->dev, "%s: min_tx_space = %u\n", __func__, sc->min_tx_space); @@ -1811,8 +1811,8 @@ slot->flags = NS_MOREFRAG; head = nm_next(head, lim); - KASSERT(head != rina->tail, - "Unexpectedly run out of TX space"); + KASSERT(head != ring->tail, + ("Unexpectedly run out of TX space")); slot = ring->slot + head; nmbuf = NMB(na, slot); nmbuf_bytes = 0; @@ -2213,7 +2213,7 @@ bool borrow = false; int i; - KASSERT(sc->num_rings > 0, "Found no queues in while polling ptnet"); + KASSERT(sc->num_rings > 0, ("Found no queues in while polling ptnet")); queue_budget = MAX(budget / sc->num_rings, 1); RD(1, "Per-queue budget is %d", queue_budget);