diff --git a/sys/net/if_lagg.c b/sys/net/if_lagg.c --- a/sys/net/if_lagg.c +++ b/sys/net/if_lagg.c @@ -171,8 +171,6 @@ /* Simple round robin */ static void lagg_rr_attach(struct lagg_softc *); static int lagg_rr_start(struct lagg_softc *, struct mbuf *); -static struct mbuf *lagg_rr_input(struct lagg_softc *, struct lagg_port *, - struct mbuf *); /* Active failover */ static int lagg_fail_start(struct lagg_softc *, struct mbuf *); @@ -185,14 +183,10 @@ static int lagg_lb_port_create(struct lagg_port *); static void lagg_lb_port_destroy(struct lagg_port *); static int lagg_lb_start(struct lagg_softc *, struct mbuf *); -static struct mbuf *lagg_lb_input(struct lagg_softc *, struct lagg_port *, - struct mbuf *); static int lagg_lb_porttable(struct lagg_softc *, struct lagg_port *); /* Broadcast */ static int lagg_bcast_start(struct lagg_softc *, struct mbuf *); -static struct mbuf *lagg_bcast_input(struct lagg_softc *, struct lagg_port *, - struct mbuf *); /* 802.3ad LACP */ static void lagg_lacp_attach(struct lagg_softc *); @@ -226,7 +220,6 @@ .pr_num = LAGG_PROTO_ROUNDROBIN, .pr_attach = lagg_rr_attach, .pr_start = lagg_rr_start, - .pr_input = lagg_rr_input, }, { .pr_num = LAGG_PROTO_FAILOVER, @@ -238,7 +231,6 @@ .pr_attach = lagg_lb_attach, .pr_detach = lagg_lb_detach, .pr_start = lagg_lb_start, - .pr_input = lagg_lb_input, .pr_addport = lagg_lb_port_create, .pr_delport = lagg_lb_port_destroy, }, @@ -260,7 +252,6 @@ { .pr_num = LAGG_PROTO_BROADCAST, .pr_start = lagg_bcast_start, - .pr_input = lagg_bcast_input, }, }; @@ -398,7 +389,10 @@ lagg_proto_input(struct lagg_softc *sc, struct lagg_port *lp, struct mbuf *m) { - return (lagg_protos[sc->sc_proto].pr_input(sc, lp, m)); + if (lagg_protos[sc->sc_proto].pr_input == NULL) + return (m); + else + return (lagg_protos[sc->sc_proto].pr_input(sc, lp, m)); } static int @@ -2186,6 +2180,8 @@ return (NULL); } + m->m_pkthdr.rcvif = scifp; + ETHER_BPF_MTAP(scifp, m); m = lagg_proto_input(sc, lp, m); @@ -2222,6 +2218,8 @@ return (NULL); } + m->m_pkthdr.rcvif = scifp; + infiniband_bpf_mtap(scifp, m); m = lagg_proto_input(sc, lp, m); @@ -2428,17 +2426,6 @@ return (lagg_enqueue(lp->lp_ifp, m)); } -static struct mbuf * -lagg_rr_input(struct lagg_softc *sc, struct lagg_port *lp, struct mbuf *m) -{ - struct ifnet *ifp = sc->sc_ifp; - - /* Just pass in the packet to our lagg device */ - m->m_pkthdr.rcvif = ifp; - - return (m); -} - /* * Broadcast mode */ @@ -2486,16 +2473,6 @@ return (ret); } -static struct mbuf* -lagg_bcast_input(struct lagg_softc *sc, struct lagg_port *lp, struct mbuf *m) -{ - struct ifnet *ifp = sc->sc_ifp; - - /* Just pass in the packet to our lagg device */ - m->m_pkthdr.rcvif = ifp; - return (m); -} - /* * Active failover */ @@ -2518,13 +2495,10 @@ static struct mbuf * lagg_fail_input(struct lagg_softc *sc, struct lagg_port *lp, struct mbuf *m) { - struct ifnet *ifp = sc->sc_ifp; struct lagg_port *tmp_tp; - if (lp == sc->sc_primary || V_lagg_failover_rx_all) { - m->m_pkthdr.rcvif = ifp; + if (lp == sc->sc_primary || V_lagg_failover_rx_all) return (m); - } if (!LAGG_PORTACTIVE(sc->sc_primary)) { tmp_tp = lagg_link_active(sc, sc->sc_primary); @@ -2532,10 +2506,8 @@ * If tmp_tp is null, we've received a packet when all * our links are down. Weird, but process it anyways. */ - if ((tmp_tp == NULL || tmp_tp == lp)) { - m->m_pkthdr.rcvif = ifp; + if (tmp_tp == NULL || tmp_tp == lp) return (m); - } } m_freem(m); @@ -2639,17 +2611,6 @@ return (lagg_enqueue(lp->lp_ifp, m)); } -static struct mbuf * -lagg_lb_input(struct lagg_softc *sc, struct lagg_port *lp, struct mbuf *m) -{ - struct ifnet *ifp = sc->sc_ifp; - - /* Just pass in the packet to our lagg device */ - m->m_pkthdr.rcvif = ifp; - - return (m); -} - /* * 802.3ad LACP */ @@ -2715,7 +2676,6 @@ static struct mbuf * lagg_lacp_input(struct lagg_softc *sc, struct lagg_port *lp, struct mbuf *m) { - struct ifnet *ifp = sc->sc_ifp; struct ether_header *eh; u_short etype; @@ -2738,6 +2698,5 @@ return (NULL); } - m->m_pkthdr.rcvif = ifp; return (m); }