From owner-svn-src-head@FreeBSD.ORG Sat Nov 22 07:35:46 2008 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 60D9D106564A; Sat, 22 Nov 2008 07:35:46 +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 4C3E88FC12; Sat, 22 Nov 2008 07:35:46 +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 mAM7ZjD6009905; Sat, 22 Nov 2008 07:35:45 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id mAM7Zjwo009895; Sat, 22 Nov 2008 07:35:45 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <200811220735.mAM7Zjwo009895@svn.freebsd.org> From: Kip Macy Date: Sat, 22 Nov 2008 07:35:45 +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: r185164 - in head/sys: net net80211 netgraph X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 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: Sat, 22 Nov 2008 07:35:46 -0000 Author: kmacy Date: Sat Nov 22 07:35:45 2008 New Revision: 185164 URL: http://svn.freebsd.org/changeset/base/185164 Log: convert calls to IFQ_HANDOFF to if_transmit Modified: head/sys/net/if_ethersubr.c head/sys/net/if_fddisubr.c head/sys/net/if_fwsubr.c head/sys/net/if_lagg.c head/sys/net/if_tun.c head/sys/net/if_vlan.c head/sys/net80211/ieee80211_hostap.c head/sys/net80211/ieee80211_output.c head/sys/net80211/ieee80211_wds.c head/sys/netgraph/ng_iface.c Modified: head/sys/net/if_ethersubr.c ============================================================================== --- head/sys/net/if_ethersubr.c Sat Nov 22 06:56:49 2008 (r185163) +++ head/sys/net/if_ethersubr.c Sat Nov 22 07:35:45 2008 (r185164) @@ -393,7 +393,6 @@ bad: if (m != NULL) int ether_output_frame(struct ifnet *ifp, struct mbuf *m) { - int error; #if defined(INET) || defined(INET6) INIT_VNET_NET(ifp->if_vnet); struct ip_fw *rule = ip_dn_claim_rule(m); @@ -413,8 +412,7 @@ ether_output_frame(struct ifnet *ifp, st * Queue message on interface, update output statistics if * successful, and start output if interface not yet active. */ - IFQ_HANDOFF(ifp, m, error); - return (error); + return ((ifp->if_transmit)(ifp, m)); } #if defined(INET) || defined(INET6) Modified: head/sys/net/if_fddisubr.c ============================================================================== --- head/sys/net/if_fddisubr.c Sat Nov 22 06:56:49 2008 (r185163) +++ head/sys/net/if_fddisubr.c Sat Nov 22 07:35:45 2008 (r185164) @@ -335,7 +335,7 @@ fddi_output(ifp, m, dst, rt0) } } - IFQ_HANDOFF(ifp, m, error); + error = (ifp->if_transmit)(ifp, m); if (error) ifp->if_oerrors++; Modified: head/sys/net/if_fwsubr.c ============================================================================== --- head/sys/net/if_fwsubr.c Sat Nov 22 06:56:49 2008 (r185163) +++ head/sys/net/if_fwsubr.c Sat Nov 22 07:35:45 2008 (r185164) @@ -249,7 +249,7 @@ firewire_output(struct ifnet *ifp, struc */ enc->ul[0] = htonl(enc->ul[0]); - IFQ_HANDOFF(ifp, m, error); + error = (ifp->if_transmit)(ifp, m); return (error); } else { /* @@ -309,7 +309,7 @@ firewire_output(struct ifnet *ifp, struc enc->ul[0] = htonl(enc->ul[0]); enc->ul[1] = htonl(enc->ul[1]); - IFQ_HANDOFF(ifp, m, error); + error = (ifp->if_transmit)(ifp, m); if (error) { if (mtail) m_freem(mtail); Modified: head/sys/net/if_lagg.c ============================================================================== --- head/sys/net/if_lagg.c Sat Nov 22 06:56:49 2008 (r185163) +++ head/sys/net/if_lagg.c Sat Nov 22 07:35:45 2008 (r185164) @@ -1370,10 +1370,8 @@ out: int lagg_enqueue(struct ifnet *ifp, struct mbuf *m) { - int error = 0; - IFQ_HANDOFF(ifp, m, error); - return (error); + return (ifp->if_transmit)(ifp, m); } /* Modified: head/sys/net/if_tun.c ============================================================================== --- head/sys/net/if_tun.c Sat Nov 22 06:56:49 2008 (r185163) +++ head/sys/net/if_tun.c Sat Nov 22 07:35:45 2008 (r185164) @@ -657,7 +657,7 @@ tunoutput( } } - IFQ_HANDOFF(ifp, m0, error); + error = (ifp->if_transmit)(ifp, m0); if (error) { ifp->if_collisions++; return (ENOBUFS); Modified: head/sys/net/if_vlan.c ============================================================================== --- head/sys/net/if_vlan.c Sat Nov 22 06:56:49 2008 (r185163) +++ head/sys/net/if_vlan.c Sat Nov 22 07:35:45 2008 (r185164) @@ -868,7 +868,7 @@ vlan_start(struct ifnet *ifp) * Send it, precisely as ether_output() would have. * We are already running at splimp. */ - IFQ_HANDOFF(p, m, error); + error = (p->if_transmit)(p, m); if (!error) ifp->if_opackets++; else Modified: head/sys/net80211/ieee80211_hostap.c ============================================================================== --- head/sys/net80211/ieee80211_hostap.c Sat Nov 22 06:56:49 2008 (r185163) +++ head/sys/net80211/ieee80211_hostap.c Sat Nov 22 07:35:45 2008 (r185164) @@ -355,7 +355,7 @@ hostap_deliver_data(struct ieee80211vap if (mcopy != NULL) { int len, err; len = mcopy->m_pkthdr.len; - IFQ_HANDOFF(ifp, mcopy, err); + err = (ifp->if_transmit)(ifp, mcopy); if (err) { /* NB: IFQ_HANDOFF reclaims mcopy */ } else { Modified: head/sys/net80211/ieee80211_output.c ============================================================================== --- head/sys/net80211/ieee80211_output.c Sat Nov 22 06:56:49 2008 (r185163) +++ head/sys/net80211/ieee80211_output.c Sat Nov 22 07:35:45 2008 (r185164) @@ -268,7 +268,7 @@ ieee80211_start(struct ifnet *ifp) m->m_pkthdr.rcvif = (void *)ni; /* XXX defer if_start calls? */ - IFQ_HANDOFF(parent, m, error); + error = (parent->if_transmit)(parent, m); if (error != 0) { /* NB: IFQ_HANDOFF reclaims mbuf */ ieee80211_free_node(ni); Modified: head/sys/net80211/ieee80211_wds.c ============================================================================== --- head/sys/net80211/ieee80211_wds.c Sat Nov 22 06:56:49 2008 (r185163) +++ head/sys/net80211/ieee80211_wds.c Sat Nov 22 07:35:45 2008 (r185164) @@ -278,7 +278,7 @@ ieee80211_dwds_mcast(struct ieee80211vap mcopy->m_flags |= M_MCAST | M_WDS; mcopy->m_pkthdr.rcvif = (void *) ni; - IFQ_HANDOFF(parent, mcopy, err); + err = (parent->if_transmit)(parent, mcopy); if (err) { /* NB: IFQ_HANDOFF reclaims mbuf */ ifp->if_oerrors++; Modified: head/sys/netgraph/ng_iface.c ============================================================================== --- head/sys/netgraph/ng_iface.c Sat Nov 22 06:56:49 2008 (r185163) +++ head/sys/netgraph/ng_iface.c Sat Nov 22 07:35:45 2008 (r185164) @@ -383,7 +383,7 @@ ng_iface_output(struct ifnet *ifp, struc return (ENOBUFS); } *(sa_family_t *)m->m_data = dst->sa_family; - IFQ_HANDOFF(ifp, m, error); + error = (ifp->if_transmit)(ifp, m); } else error = ng_iface_send(ifp, m, dst->sa_family);