From owner-svn-src-projects@FreeBSD.ORG Wed Mar 30 21:21:26 2011 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A9C9A1065670; Wed, 30 Mar 2011 21:21:26 +0000 (UTC) (envelope-from attilio@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 97A258FC1C; Wed, 30 Mar 2011 21:21:26 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p2ULLQ1J081240; Wed, 30 Mar 2011 21:21:26 GMT (envelope-from attilio@svn.freebsd.org) Received: (from attilio@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2ULLQmo081238; Wed, 30 Mar 2011 21:21:26 GMT (envelope-from attilio@svn.freebsd.org) Message-Id: <201103302121.p2ULLQmo081238@svn.freebsd.org> From: Attilio Rao Date: Wed, 30 Mar 2011 21:21:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r220170 - projects/sv/sys/netinet X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Mar 2011 21:21:26 -0000 Author: attilio Date: Wed Mar 30 21:21:26 2011 New Revision: 220170 URL: http://svn.freebsd.org/changeset/base/220170 Log: - Fix a style bug - Use the if_transmit() method directly. That enables the multiqueue support where available avoiding to bypass the overridden functions. In critical conditions (panic, or however when the CPUs are stopped) a different function needs to be used in order to avoid acquiring the locks and allocating the mbufs. It needs to be a shortcut for a direct handover of the mbuf. Modified: projects/sv/sys/netinet/netdump_client.c Modified: projects/sv/sys/netinet/netdump_client.c ============================================================================== --- projects/sv/sys/netinet/netdump_client.c Wed Mar 30 20:13:55 2011 (r220169) +++ projects/sv/sys/netinet/netdump_client.c Wed Mar 30 21:21:26 2011 (r220170) @@ -316,21 +316,13 @@ netdump_ether_output(struct mbuf *m, str memcpy(eh->ether_dhost, dst.octet, ETHER_ADDR_LEN); eh->ether_type = htons(etype); - if (((ifp->if_flags & (IFF_MONITOR|IFF_UP)) != IFF_UP) || + if (((ifp->if_flags & (IFF_MONITOR | IFF_UP)) != IFF_UP) || (ifp->if_drv_flags & IFF_DRV_RUNNING) != IFF_DRV_RUNNING) { if_printf(ifp, "netdump_ether_output: Interface isn't up\n"); m_freem(m); return (ENETDOWN); } - - if (_IF_QFULL(&ifp->if_snd)) { - if_printf(ifp, "netdump_ether_output: TX queue full\n"); - m_freem(m); - return (ENOBUFS); - } - - _IF_ENQUEUE(&ifp->if_snd, m); - return (0); + return ((ifp->if_transmit(ifp, m)); } /*