svn commit: r360047 - head/sys/net

[Alexander V. Chernikov]

Author: melifaro
Date: Fri Apr 17 17:05:58 2020
New Revision: 360047
URL: https://svnweb.freebsd.org/changeset/base/360047

Log:
  Finish r191148: replace rtentry with route in if_bridge if_output() callback.
  
  Generic if_output() callback signature was modified to use struct route
   instead of struct rtentry in r191148, back in 2009.
  
  Quoting commit message:
  
   Change if_output to take a struct route as its fourth argument in order
   to allow passing a cached struct llentry * down to L2
  
  Fix bridge_output() to match this signature and update the remaining
   comment in if_var.h.
  
  Reviewed by:	kp
  MFC after:	2 weeks
  Differential Revision:	https://reviews.freebsd.org/D24394

Modified:
  head/sys/net/if_bridge.c
  head/sys/net/if_var.h

Modified: head/sys/net/if_bridge.c
==============================================================================
--- head/sys/net/if_bridge.c	Fri Apr 17 16:55:14 2020	(r360046)
+++ head/sys/net/if_bridge.c	Fri Apr 17 17:05:58 2020	(r360047)
@@ -302,7 +302,7 @@ static int	bridge_transmit(struct ifnet *, struct mbuf
 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 @@ bridge_dummynet(struct mbuf *m, struct ifnet *ifp)
  */
 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;

Modified: head/sys/net/if_var.h
==============================================================================
--- head/sys/net/if_var.h	Fri Apr 17 16:55:14 2020	(r360046)
+++ head/sys/net/if_var.h	Fri Apr 17 17:05:58 2020	(r360047)
@@ -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.