diff options
| author | kmacy <kmacy@FreeBSD.org> | 2009-04-27 22:55:48 +0000 |
|---|---|---|
| committer | kmacy <kmacy@FreeBSD.org> | 2009-04-27 22:55:48 +0000 |
| commit | f60f0670777b080f374bf6e1a07b81d47fdfecbb (patch) | |
| tree | b7aadb93d67ad8deb0f99db41dbefb955dd20fd0 /sys/dev/e1000/if_em.h | |
| parent | cbcf0bd3a04e3474d6de3f137b5c57724d33d17e (diff) | |
| download | FreeBSD-src-f60f0670777b080f374bf6e1a07b81d47fdfecbb.zip FreeBSD-src-f60f0670777b080f374bf6e1a07b81d47fdfecbb.tar.gz | |
collapse the two em_start_locked routines in to one
Diffstat (limited to 'sys/dev/e1000/if_em.h')
| -rw-r--r-- | sys/dev/e1000/if_em.h | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/sys/dev/e1000/if_em.h b/sys/dev/e1000/if_em.h index b9ae02a..215a2b1 100644 --- a/sys/dev/e1000/if_em.h +++ b/sys/dev/e1000/if_em.h @@ -304,6 +304,8 @@ struct adapter { struct ifnet *ifp; #ifdef IFNET_BUF_RING struct buf_ring *br; +#else + void *br; #endif struct e1000_hw hw; @@ -496,7 +498,25 @@ typedef struct _DESCRIPTOR_PAIR #ifdef IFNET_BUF_RING #define ADAPTER_RING_EMPTY(adapter) drbr_empty((adapter)->ifp, (adapter)->br) +#define em_dequeue drbr_dequeue + #else #define ADAPTER_RING_EMPTY(adapter) IFQ_DRV_IS_EMPTY(&((adapter)->ifp->if_snd)) +#define drbr_free(br, type) +static __inline struct mbuf * +em_dequeue(struct ifnet *ifp, struct buf_ring *br) +{ + struct mbuf *m; + + IFQ_DRV_DEQUEUE(&ifp->if_snd, m); + return (m); +} +#ifdef BUF_RING_UNDEFINED + +struct buf_ring { +}; + +#endif #endif + #endif /* _EM_H_DEFINED_ */ |
