.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D27286/new/.diff
View Options

	Index: head/sys/net/ifq.h
	===================================================================
	--- head/sys/net/ifq.h
	+++ head/sys/net/ifq.h
	@@ -336,7 +336,7 @@
	}

	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_new)
	{
	/*
	* The top of the list needs to be swapped
	@@ -348,11 +348,11 @@
	* Peek in altq case dequeued it
	* so put it back.
	*/
	- IFQ_DRV_PREPEND(&ifp->if_snd, new);
	+ IFQ_DRV_PREPEND(&ifp->if_snd, m_new);
	return;
	}
	#endif
	- buf_ring_putback_sc(br, new);
	+ buf_ring_putback_sc(br, m_new);
	}

	static __inline struct mbuf *
	@@ -371,7 +371,7 @@
	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 @@
	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 @@
	return (m);
	}
	#endif
	- return (buf_ring_dequeue_sc(br));
	+ return ((struct mbuf *)buf_ring_dequeue_sc(br));
	}

	static __inline void
	@@ -438,11 +438,11 @@
	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