diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2015-12-04 10:32:43 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2015-12-04 10:32:43 +0000 |
| commit | 2d8bee4ac021806ca265036a1b818b08f3e4d9cf (patch) | |
| tree | 3fd91829fa6f1112051fc2f4e97cbde28b81d725 | |
| parent | 8a8e5c8dda4c1b5b055e4d0e41ab66d40a28fc23 (diff) | |
bridge(4) never outputs packets so set its if_output and if_start to NULL.
bridge_output() is used by the stack to duplicate a packet coming from a
bridge member to its other ports.
Confusion pointed by Momtchil Momtchev on misc@
ok reyk@
| -rw-r--r-- | sys/net/if_bridge.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index 50365b8effa..a9eedfe139e 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bridge.c,v 1.273 2015/12/02 08:04:12 mpi Exp $ */ +/* $OpenBSD: if_bridge.c,v 1.274 2015/12/04 10:32:42 mpi Exp $ */ /* * Copyright (c) 1999, 2000 Jason L. Wright (jason@thought.net) @@ -111,7 +111,6 @@ void bridgeattach(int); int bridge_ioctl(struct ifnet *, u_long, caddr_t); int bridge_input(struct ifnet *, struct mbuf *, void *); -void bridge_start(struct ifnet *); void bridge_process(struct ifnet *, struct mbuf *); void bridgeintr_frame(struct bridge_softc *, struct ifnet *, struct mbuf *); void bridge_broadcast(struct bridge_softc *, struct ifnet *, @@ -189,8 +188,8 @@ bridge_clone_create(struct if_clone *ifc, int unit) ifp->if_softc = sc; ifp->if_mtu = ETHERMTU; ifp->if_ioctl = bridge_ioctl; - ifp->if_output = bridge_output; - ifp->if_start = bridge_start; + ifp->if_output = NULL; + ifp->if_start = NULL; ifp->if_type = IFT_BRIDGE; ifp->if_hdrlen = ETHER_HDR_LEN; @@ -833,14 +832,6 @@ sendunicast: } /* - * Start output on the bridge. This function should never be called. - */ -void -bridge_start(struct ifnet *ifp) -{ -} - -/* * Loop through each bridge interface and process their input queues. */ void |