From owner-svn-src-all@FreeBSD.ORG Mon Apr 27 22:46:27 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1DE0E1065690; Mon, 27 Apr 2009 22:46:27 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0C83F8FC21; Mon, 27 Apr 2009 22:46:27 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3RMkQJw029537; Mon, 27 Apr 2009 22:46:26 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3RMkQTI029536; Mon, 27 Apr 2009 22:46:26 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <200904272246.n3RMkQTI029536@svn.freebsd.org> From: Kip Macy Date: Mon, 27 Apr 2009 22:46:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r191608 - head/sys/net X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Apr 2009 22:46:27 -0000 Author: kmacy Date: Mon Apr 27 22:46:26 2009 New Revision: 191608 URL: http://svn.freebsd.org/changeset/base/191608 Log: replace IFQ_ENQUEUE + if_start with if_transmit Modified: head/sys/net/bridgestp.c Modified: head/sys/net/bridgestp.c ============================================================================== --- head/sys/net/bridgestp.c Mon Apr 27 22:45:56 2009 (r191607) +++ head/sys/net/bridgestp.c Mon Apr 27 22:46:26 2009 (r191608) @@ -98,7 +98,6 @@ static void bstp_decode_bpdu(struct bstp struct bstp_config_unit *); static void bstp_send_bpdu(struct bstp_state *, struct bstp_port *, struct bstp_cbpdu *); -static void bstp_enqueue(struct ifnet *, struct mbuf *); static int bstp_pdu_flags(struct bstp_port *); static void bstp_received_stp(struct bstp_state *, struct bstp_port *, struct mbuf **, struct bstp_tbpdu *); @@ -262,7 +261,7 @@ bstp_transmit_tcn(struct bstp_state *bs, memcpy(mtod(m, caddr_t) + sizeof(*eh), &bpdu, sizeof(bpdu)); bp->bp_txcount++; - bstp_enqueue(ifp, m); + ifp->if_transmit(ifp, m); } static void @@ -391,18 +390,7 @@ bstp_send_bpdu(struct bstp_state *bs, st m->m_len = m->m_pkthdr.len; bp->bp_txcount++; - bstp_enqueue(ifp, m); -} - -static void -bstp_enqueue(struct ifnet *dst_ifp, struct mbuf *m) -{ - int err = 0; - - IFQ_ENQUEUE(&dst_ifp->if_snd, m, err); - - if ((dst_ifp->if_drv_flags & IFF_DRV_OACTIVE) == 0) - (*dst_ifp->if_start)(dst_ifp); + ifp->if_transmit(ifp, m); } static int