From owner-svn-src-head@FreeBSD.ORG Fri Nov 8 22:40:33 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id E0267330; Fri, 8 Nov 2013 22:40:33 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id CDE9A252D; Fri, 8 Nov 2013 22:40:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA8MeXb3085178; Fri, 8 Nov 2013 22:40:33 GMT (envelope-from zec@svn.freebsd.org) Received: (from zec@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA8MeXJC085177; Fri, 8 Nov 2013 22:40:33 GMT (envelope-from zec@svn.freebsd.org) Message-Id: <201311082240.rA8MeXJC085177@svn.freebsd.org> From: Marko Zec Date: Fri, 8 Nov 2013 22:40:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r257868 - head/sys/netgraph X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 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: Fri, 08 Nov 2013 22:40:34 -0000 Author: zec Date: Fri Nov 8 22:40:33 2013 New Revision: 257868 URL: http://svnweb.freebsd.org/changeset/base/257868 Log: Eliminate duplicated & dead code. MFC after: 3 days Modified: head/sys/netgraph/ng_pipe.c Modified: head/sys/netgraph/ng_pipe.c ============================================================================== --- head/sys/netgraph/ng_pipe.c Fri Nov 8 22:29:07 2013 (r257867) +++ head/sys/netgraph/ng_pipe.c Fri Nov 8 22:40:33 2013 (r257868) @@ -705,35 +705,6 @@ ngp_rcvdata(hook_p hook, item_p item) } hinfo->run.qin_frames--; hinfo->stats.in_disc_frames++; - } else if (hinfo->run.qin_frames > hinfo->cfg.qin_size_limit) { - struct mbuf *m1; - int longest = 0; - - /* Find the longest queue */ - TAILQ_FOREACH(ngp_f1, &hinfo->fifo_head, fifo_le) - if (ngp_f1->packets > longest) { - longest = ngp_f1->packets; - ngp_f = ngp_f1; - } - - /* Drop a frame from the queue head/tail, depending on cfg */ - if (hinfo->cfg.drophead) - ngp_h = TAILQ_FIRST(&ngp_f->packet_head); - else - ngp_h = TAILQ_LAST(&ngp_f->packet_head, p_head); - TAILQ_REMOVE(&ngp_f->packet_head, ngp_h, ngp_link); - m1 = ngp_h->m; - uma_zfree(ngp_zone, ngp_h); - hinfo->run.qin_octets -= m1->m_pkthdr.len; - hinfo->stats.in_disc_octets += m1->m_pkthdr.len; - m_freem(m1); - if (--(ngp_f->packets) == 0) { - TAILQ_REMOVE(&hinfo->fifo_head, ngp_f, fifo_le); - uma_zfree(ngp_zone, ngp_f); - hinfo->run.fifo_queues--; - } - hinfo->run.qin_frames--; - hinfo->stats.in_disc_frames++; } /*