diff options
Diffstat (limited to 'freebsd/sys/net/ifq.h')
-rw-r--r-- | freebsd/sys/net/ifq.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/freebsd/sys/net/ifq.h b/freebsd/sys/net/ifq.h index bffb80c3..cd980437 100644 --- a/freebsd/sys/net/ifq.h +++ b/freebsd/sys/net/ifq.h @@ -336,7 +336,7 @@ drbr_enqueue(struct ifnet *ifp, struct buf_ring *br, struct mbuf *m) } static __inline void -drbr_putback(struct ifnet *ifp, struct buf_ring *br, struct mbuf *new) +drbr_putback(struct ifnet *ifp, struct buf_ring *br, struct mbuf *m) { /* * The top of the list needs to be swapped @@ -348,11 +348,11 @@ drbr_putback(struct ifnet *ifp, struct buf_ring *br, struct mbuf *new) * Peek in altq case dequeued it * so put it back. */ - IFQ_DRV_PREPEND(&ifp->if_snd, new); + IFQ_DRV_PREPEND(&ifp->if_snd, m); return; } #endif - buf_ring_putback_sc(br, new); + buf_ring_putback_sc(br, m); } static __inline struct mbuf * @@ -371,7 +371,7 @@ drbr_peek(struct ifnet *ifp, struct buf_ring *br) return (m); } #endif - return(buf_ring_peek_clear_sc(br)); + return ((struct mbuf *)buf_ring_peek_clear_sc(br)); } static __inline void @@ -383,7 +383,7 @@ drbr_flush(struct ifnet *ifp, struct buf_ring *br) if (ifp != NULL && ALTQ_IS_ENABLED(&ifp->if_snd)) IFQ_PURGE(&ifp->if_snd); #endif - while ((m = buf_ring_dequeue_sc(br)) != NULL) + while ((m = (struct mbuf *)buf_ring_dequeue_sc(br)) != NULL) m_freem(m); } @@ -406,7 +406,7 @@ drbr_dequeue(struct ifnet *ifp, struct buf_ring *br) return (m); } #endif - return (buf_ring_dequeue_sc(br)); + return ((struct mbuf *)buf_ring_dequeue_sc(br)); } static __inline void @@ -439,11 +439,11 @@ drbr_dequeue_cond(struct ifnet *ifp, struct buf_ring *br, return (m); } #endif - m = buf_ring_peek(br); + m = (struct mbuf *)buf_ring_peek(br); if (m == NULL || func(m, arg) == 0) return (NULL); - return (buf_ring_dequeue_sc(br)); + return ((struct mbuf *)buf_ring_dequeue_sc(br)); } static __inline int |