summaryrefslogtreecommitdiffstats
path: root/sys/net/if_var.h
diff options
context:
space:
mode:
authorrwatson <rwatson@FreeBSD.org>2004-10-30 09:39:13 +0000
committerrwatson <rwatson@FreeBSD.org>2004-10-30 09:39:13 +0000
commitf71b496ed7e5680b0f0e4a9da173613f1e0ab32c (patch)
treefb5fe1e577fbebdf4db11d4f77dc81c15915fb48 /sys/net/if_var.h
parent17c0d55bc06a42141bc410a636e74a2a8a31a933 (diff)
downloadFreeBSD-src-f71b496ed7e5680b0f0e4a9da173613f1e0ab32c.zip
FreeBSD-src-f71b496ed7e5680b0f0e4a9da173613f1e0ab32c.tar.gz
Move if_handoff() from an inline in if_var.h to a function to if.c
in orden to harden the ABI for 5.x; this will permit us to modify the locking in the ifnet packet dispatch without requiring drivers to be recompiled. MFC after: 3 days Discussed at: EuroBSDCon Developer's Summit
Diffstat (limited to 'sys/net/if_var.h')
-rw-r--r--sys/net/if_var.h26
1 files changed, 2 insertions, 24 deletions
diff --git a/sys/net/if_var.h b/sys/net/if_var.h
index 149f895..0541126 100644
--- a/sys/net/if_var.h
+++ b/sys/net/if_var.h
@@ -342,6 +342,8 @@ EVENTHANDLER_DECLARE(ifnet_departure_event, ifnet_departure_event_handler_t);
mtx_unlock(&Giant); \
} while (0)
+int if_handoff(struct ifqueue *ifq, struct mbuf *m, struct ifnet *ifp,
+ int adjust);
#define IF_HANDOFF(ifq, m, ifp) \
if_handoff((struct ifqueue *)ifq, m, ifp, 0)
#define IF_HANDOFF_ADJ(ifq, m, ifp, adj) \
@@ -349,30 +351,6 @@ EVENTHANDLER_DECLARE(ifnet_departure_event, ifnet_departure_event_handler_t);
void if_start(struct ifnet *);
-static __inline int
-if_handoff(struct ifqueue *ifq, struct mbuf *m, struct ifnet *ifp, int adjust)
-{
- int active = 0;
-
- IF_LOCK(ifq);
- if (_IF_QFULL(ifq)) {
- _IF_DROP(ifq);
- IF_UNLOCK(ifq);
- m_freem(m);
- return (0);
- }
- if (ifp != NULL) {
- ifp->if_obytes += m->m_pkthdr.len + adjust;
- if (m->m_flags & (M_BCAST|M_MCAST))
- ifp->if_omcasts++;
- active = ifp->if_flags & IFF_OACTIVE;
- }
- _IF_ENQUEUE(ifq, m);
- IF_UNLOCK(ifq);
- if (ifp != NULL && !active)
- if_start(ifp);
- return (1);
-}
#if 1 /* ALTQ */
#define IFQ_ENQUEUE(ifq, m, err) \
do { \
OpenPOWER on IntegriCloud