diff options
author | kmacy <kmacy@FreeBSD.org> | 2008-11-22 07:35:45 +0000 |
---|---|---|
committer | kmacy <kmacy@FreeBSD.org> | 2008-11-22 07:35:45 +0000 |
commit | 2b4df7158b97113f7626cc478468c3f3c3a688c9 (patch) | |
tree | 7d39801888876e0d7568cc61b7aee682c91b176b /sys | |
parent | 07d364adf02c9370780cae58faf75152aa132e10 (diff) | |
download | FreeBSD-src-2b4df7158b97113f7626cc478468c3f3c3a688c9.zip FreeBSD-src-2b4df7158b97113f7626cc478468c3f3c3a688c9.tar.gz |
convert calls to IFQ_HANDOFF to if_transmit
Diffstat (limited to 'sys')
-rw-r--r-- | sys/net/if_ethersubr.c | 4 | ||||
-rw-r--r-- | sys/net/if_fddisubr.c | 2 | ||||
-rw-r--r-- | sys/net/if_fwsubr.c | 4 | ||||
-rw-r--r-- | sys/net/if_lagg.c | 4 | ||||
-rw-r--r-- | sys/net/if_tun.c | 2 | ||||
-rw-r--r-- | sys/net/if_vlan.c | 2 | ||||
-rw-r--r-- | sys/net80211/ieee80211_hostap.c | 2 | ||||
-rw-r--r-- | sys/net80211/ieee80211_output.c | 2 | ||||
-rw-r--r-- | sys/net80211/ieee80211_wds.c | 2 | ||||
-rw-r--r-- | sys/netgraph/ng_iface.c | 2 |
10 files changed, 11 insertions, 15 deletions
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c index 70075f6..d790d91 100644 --- a/sys/net/if_ethersubr.c +++ b/sys/net/if_ethersubr.c @@ -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, struct mbuf *m) * 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) diff --git a/sys/net/if_fddisubr.c b/sys/net/if_fddisubr.c index 752400e..e37d7ae 100644 --- a/sys/net/if_fddisubr.c +++ b/sys/net/if_fddisubr.c @@ -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++; diff --git a/sys/net/if_fwsubr.c b/sys/net/if_fwsubr.c index 8d4f159..77e7b70 100644 --- a/sys/net/if_fwsubr.c +++ b/sys/net/if_fwsubr.c @@ -249,7 +249,7 @@ firewire_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst, */ 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, struct mbuf *m, struct sockaddr *dst, 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); diff --git a/sys/net/if_lagg.c b/sys/net/if_lagg.c index 54c4594..be6e0b8 100644 --- a/sys/net/if_lagg.c +++ b/sys/net/if_lagg.c @@ -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); } /* diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c index 28c91de..216d325 100644 --- a/sys/net/if_tun.c +++ b/sys/net/if_tun.c @@ -657,7 +657,7 @@ tunoutput( } } - IFQ_HANDOFF(ifp, m0, error); + error = (ifp->if_transmit)(ifp, m0); if (error) { ifp->if_collisions++; return (ENOBUFS); diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c index af164e3..586fefd 100644 --- a/sys/net/if_vlan.c +++ b/sys/net/if_vlan.c @@ -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 diff --git a/sys/net80211/ieee80211_hostap.c b/sys/net80211/ieee80211_hostap.c index fbc0305..60cbe4b 100644 --- a/sys/net80211/ieee80211_hostap.c +++ b/sys/net80211/ieee80211_hostap.c @@ -355,7 +355,7 @@ hostap_deliver_data(struct ieee80211vap *vap, 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 { diff --git a/sys/net80211/ieee80211_output.c b/sys/net80211/ieee80211_output.c index f29b47e..e5c6889 100644 --- a/sys/net80211/ieee80211_output.c +++ b/sys/net80211/ieee80211_output.c @@ -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); diff --git a/sys/net80211/ieee80211_wds.c b/sys/net80211/ieee80211_wds.c index b003481..fe59293 100644 --- a/sys/net80211/ieee80211_wds.c +++ b/sys/net80211/ieee80211_wds.c @@ -278,7 +278,7 @@ ieee80211_dwds_mcast(struct ieee80211vap *vap0, struct mbuf *m) 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++; diff --git a/sys/netgraph/ng_iface.c b/sys/netgraph/ng_iface.c index e86dfc8..35fc1cc8 100644 --- a/sys/netgraph/ng_iface.c +++ b/sys/netgraph/ng_iface.c @@ -383,7 +383,7 @@ ng_iface_output(struct ifnet *ifp, struct mbuf *m, 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); |