diff options
| author | Alexander V. Chernikov <melifaro@FreeBSD.org> | 2020-04-17 17:05:58 +0000 |
|---|---|---|
| committer | Alexander V. Chernikov <melifaro@FreeBSD.org> | 2020-04-17 17:05:58 +0000 |
| commit | 67452942808dde65bcccd11d1ca925492934615e (patch) | |
| tree | a38be6729adbe2d89c56b232fe2fe1b21c55fe47 /sys/net | |
| parent | 6e17fbacea4ff6792d72ca044c5fb3e7366e850d (diff) | |
| download | src-67452942808dde65bcccd11d1ca925492934615e.tar.gz src-67452942808dde65bcccd11d1ca925492934615e.zip | |
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
Notes
Notes:
svn path=/head/; revision=360047
Diffstat (limited to 'sys/net')
| -rw-r--r-- | sys/net/if_bridge.c | 4 | ||||
| -rw-r--r-- | sys/net/if_var.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index f8865325f177..1ef316abfeb6 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -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; diff --git a/sys/net/if_var.h b/sys/net/if_var.h index e37aaaaa1dca..1664292b7b76 100644 --- a/sys/net/if_var.h +++ b/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. |