D24394.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D24394.diff
View Options

	Index: head/sys/net/if_bridge.c
	===================================================================
	--- head/sys/net/if_bridge.c
	+++ head/sys/net/if_bridge.c
	@@ -302,7 +302,7 @@
	static void bridge_qflush(struct ifnet *);
	static struct mbuf bridge_input(struct ifnet , struct mbuf *);
	static int bridge_output(struct ifnet , struct mbuf , struct sockaddr *,
	- struct rtentry *);
	+ struct route *);
	static int bridge_enqueue(struct bridge_softc , struct ifnet ,
	struct mbuf *);
	static void bridge_rtdelete(struct bridge_softc , struct ifnet ifp, int);
	@@ -2061,7 +2061,7 @@
	*/
	static int
	bridge_output(struct ifnet ifp, struct mbuf m, struct sockaddr *sa,
	- struct rtentry *rt)
	+ struct route *ro __unused)
	{
	struct ether_header *eh;
	struct ifnet bifp, dst_if;
	Index: head/sys/net/if_var.h
	===================================================================
	--- head/sys/net/if_var.h
	+++ head/sys/net/if_var.h
	@@ -44,7 +44,7 @@
	* received from its medium.
	*
	* Output occurs when the routine if_output is called, with three parameters:
	- * (*ifp->if_output)(ifp, m, dst, rt)
	+ * (*ifp->if_output)(ifp, m, dst, ro)
	* Here m is the mbuf chain to be sent and dst is the destination address.
	* The output routine encapsulates the supplied datagram if necessary,
	* and then transmits it on its medium.