From owner-svn-src-head@FreeBSD.ORG Mon Jan 12 15:11:22 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E510F73B; Mon, 12 Jan 2015 15:11:22 +0000 (UTC) Received: from mail.ipfw.ru (mail.ipfw.ru [IPv6:2a01:4f8:120:6141::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A8547A47; Mon, 12 Jan 2015 15:11:22 +0000 (UTC) Received: from [2a02:6b8:0:401:222:4dff:fe50:cd2f] (helo=ptichko.yndx.net) by mail.ipfw.ru with esmtpsa (TLSv1:DHE-RSA-AES128-SHA:128) (Exim 4.82 (FreeBSD)) (envelope-from ) id 1YAgeG-0009AB-PE; Mon, 12 Jan 2015 19:11:20 +0400 Message-ID: <54B3E3BE.7090302@FreeBSD.org> Date: Mon, 12 Jan 2015 18:09:50 +0300 From: "Alexander V. Chernikov" User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:31.0) Gecko/20100101 Thunderbird/31.2.0 MIME-Version: 1.0 To: Gleb Smirnoff , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r277072 - head/sys/netinet6 References: <201501121452.t0CEqihQ050794@svn.freebsd.org> In-Reply-To: <201501121452.t0CEqihQ050794@svn.freebsd.org> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Jan 2015 15:11:23 -0000 On 12.01.2015 17:52, Gleb Smirnoff wrote: > Author: glebius > Date: Mon Jan 12 14:52:43 2015 > New Revision: 277072 > URL: https://svnweb.freebsd.org/changeset/base/277072 > > Log: > Do not go one layer down to check ifqueue length. First, not all drivers > use ifqueue at all. Second, there is no point in this lockless check. > Either positive or negative result of the check could be incorrect after > a tick. Finally, no useless ifq_maxlen check! Thanks! > > Sponsored by: Nginx, Inc. > > Modified: > head/sys/netinet6/ip6_output.c > > Modified: head/sys/netinet6/ip6_output.c > ============================================================================== > --- head/sys/netinet6/ip6_output.c Mon Jan 12 13:53:40 2015 (r277071) > +++ head/sys/netinet6/ip6_output.c Mon Jan 12 14:52:43 2015 (r277072) > @@ -905,8 +905,6 @@ passout: > u_int32_t id = htonl(ip6_randomid()); > u_char nextproto; > > - int qslots = ifp->if_snd.ifq_maxlen - ifp->if_snd.ifq_len; > - > /* > * Too large for the destination or interface; > * fragment if possible. > @@ -924,18 +922,6 @@ passout: > } > > /* > - * Verify that we have any chance at all of being able to queue > - * the packet or packet fragments > - */ > - if (qslots <= 0 || ((u_int)qslots * (mtu - hlen) > - < tlen /* - hlen */)) { > - error = ENOBUFS; > - IP6STAT_INC(ip6s_odropped); > - goto bad; > - } > - > - > - /* > * If the interface will not calculate checksums on > * fragmented packets, then do it here. > * XXX-BZ handle the hw offloading case. Need flags. > >