diff options
| author | Claudio Jeker <claudio@cvs.openbsd.org> | 2015-12-02 08:47:01 +0000 |
|---|---|---|
| committer | Claudio Jeker <claudio@cvs.openbsd.org> | 2015-12-02 08:47:01 +0000 |
| commit | fa7fd7050265a0a67d5ff6d4050ed32e0027237b (patch) | |
| tree | 54e25d10e90ca37841a3b9398213c82090030e20 /sys/net/if.c | |
| parent | ebdc640a2f0b13fd72b88cbf3c746b840846df32 (diff) | |
Rework the MPLS handling. Remove the lookup loops since nothing is using
them and they make everything so much harder with no gain. Remove the
ifp argument from mpls_input since it is not needed. On the input side
the lookup side is modified a bit when it comes to BOS handling.
Tested in a L3VPN setup with ldpd and bgpd. Commiting now so we can move
on with cleaning up rt_ifp usage. If this breaks L2VPN I will fix it once
reported. OK mpi@
Diffstat (limited to 'sys/net/if.c')
| -rw-r--r-- | sys/net/if.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/net/if.c b/sys/net/if.c index f95bd1527fe..330694c05b6 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if.c,v 1.415 2015/12/01 16:57:34 vgross Exp $ */ +/* $OpenBSD: if.c,v 1.416 2015/12/02 08:47:00 claudio Exp $ */ /* $NetBSD: if.c,v 1.35 1996/05/07 05:26:04 thorpej Exp $ */ /* @@ -663,7 +663,7 @@ if_input_local(struct ifnet *ifp, struct mbuf *m, sa_family_t af) case AF_MPLS: ifp->if_ipackets++; ifp->if_ibytes += m->m_pkthdr.len; - mpls_input(ifp, m); + mpls_input(m); return (0); #endif /* MPLS */ default: |