From owner-freebsd-pf@FreeBSD.ORG Thu Sep 16 03:44:14 2004 Return-Path: Delivered-To: freebsd-pf@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 674) id C1CE516A4CF; Thu, 16 Sep 2004 03:44:14 +0000 (GMT) Delivered-To: mlaier@vampire.homelinux.org Received: (qmail 4766 invoked by uid 1005); 5 Aug 2003 20:09:00 -0000 Delivered-To: max@vampire.homelinux.org Received: (qmail 4763 invoked from network); 5 Aug 2003 20:08:54 -0000 Received: from moutng.kundenserver.de (212.227.126.184) by pd9530e20.dip.t-dialin.net with SMTP; 5 Aug 2003 20:08:54 -0000 Received: from [212.227.126.159] (helo=mxng09.kundenserver.de) by moutng.kundenserver.de with esmtp (Exim 3.35 #1) id 19k8zD-0003GJ-00 for max@vampire.homelinux.org; Tue, 05 Aug 2003 23:04:51 +0200 Received: from [206.53.239.180] (helo=turing.freelists.org) by mxng09.kundenserver.de with esmtp (Exim 3.35 #1) id 19k8z8-0006x0-00 for max@love2party.net; Tue, 05 Aug 2003 23:04:46 +0200 Received: from turing (localhost [127.0.0.1])ESMTP id 44FD739523C; Tue, 5 Aug 2003 16:08:48 -0500 (EST) Received: with ECARTIS (v1.0.0; list pf4freebsd); Tue, 05 Aug 2003 16:08:44 -0500 (EST) Delivered-To: pf4freebsd@freelists.org Received: from mail.nipsi.de (b121252.adsl.hansenet.de [62.109.121.252]) ESMTP id 6F4D0395352 for ; Tue, 5 Aug 2003 16:08:42 -0500 (EST) Received: from blackbox.home.net (blackbox.home.net [172.16.1.13]) (TLS: TLSv1/SSLv3,256bits,AES256-SHA) by mail.nipsi.de with esmtp; Tue, 05 Aug 2003 23:04:22 +0200 Received: from BSDsystems.de (blackbox.home.net [172.16.1.13]) by blackbox.home.net (8.12.9/8.12.9) with ESMTP id h75L4WN5089707; Tue, 5 Aug 2003 23:04:32 +0200 (CEST) (envelope-from Dennis.Berger@BSDsystems.de) Message-ID: <3F301BE0.1040103@BSDsystems.de> From: Dennis Berger User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.4) Gecko/20030704 X-Accept-Language: en-us, en MIME-Version: 1.0 To: freebsd-altq@rofug.ro References: <003501c35b54$c5187240$01000001@max900> In-Reply-To: <003501c35b54$c5187240$01000001@max900> Content-type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit X-archive-position: 75 X-ecartis-version: Ecartis v1.0.0 Sender: pf4freebsd-bounce@freelists.org Errors-To: pf4freebsd-bounce@freelists.org X-original-sender: Dennis.Berger@BSDsystems.de Precedence: normal X-list: pf4freebsd X-UID: 181 X-Length: 3906 X-Mailman-Approved-At: Thu, 16 Sep 2004 03:55:51 +0000 cc: pf4freebsd@freelists.org Subject: [pf4freebsd] Re: [ALTQ/FreeBSD] Patch: if_tun.c (forgot the polling) X-BeenThere: freebsd-pf@freebsd.org X-Mailman-Version: 2.1.1 Reply-To: pf4freebsd@freelists.org List-Id: Technical discussion and general questions about packet filter (pf) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Thu, 16 Sep 2004 03:44:14 -0000 X-Original-Date: Tue, 05 Aug 2003 23:04:32 +0200 X-List-Received-Date: Thu, 16 Sep 2004 03:44:14 -0000 Max Laier wrote: >Here is a patch for if_tun.c. This should finally enable tun(4) for >queueing. In my earlier patch sent to Dennis I forgot to modify the polling >as well: > > >@@ -838,12 +861,14 @@ > struct tun_softc *tp = dev->si_drv1; > struct ifnet *ifp = &tp->tun_if; > int revents = 0; >+ struct mbuf *m; > > s = splimp(); > TUNDEBUG("%s%d: tunpoll\n", ifp->if_name, ifp->if_unit); > > if (events & (POLLIN | POLLRDNORM)) { >- if (ifp->if_snd.ifq_len > 0) { >+ IFQ_POLL_NOLOCK(&ifp->if_snd, m); >+ if (m != NULL) { > TUNDEBUG("%s%d: tunpoll q=%d\n", ifp->if_name, > ifp->if_unit, ifp->if_snd.ifq_len); > revents |= events & (POLLIN | POLLRDNORM); > > >I hope this now really does the trick. Tests with Daniel's ACKPRI-Tutorial >show good results. > >@Dennis: What patch format is best for you to incooperate into your release? >This one is a unified diff against unpatched source. > >Regards, > Max > > OK it's integrated and working _very_ well I released a new patchset 0.4.1 available on http://www.nipsi.de/FreeBSD/altq-freebsd-5.1-release-0.4.1.tar.gz -db