CVSROOT:        /cvs
Module name:    src
Changes by:     clau...@cvs.openbsd.org 2010/05/28 06:09:10

Modified files:
        sys/net        : if.c if.h if_ethersubr.c if_mpe.c 
        sys/netmpls    : mpls.h mpls_input.c mpls_output.c 

Log message:
Rework the way we handle MPLS in the kernel. Instead of fumbling MPLS into
ether_output() and later on other L2 output functions use a trick and over-
load the ifp->if_output() function pointer on MPLS enabled interfaces to
go through mpls_output() which will then call the link level output function.
By setting IFXF_MPLS on an interface the output pointers are switched.
This now allows to cleanup the MPLS input and output pathes and fix mpe(4)
so that the MPLS code now actually works for both P and PE systems.
Tested by myself and michele
(A custom kernel with MPLS and mpe enabled is still needed).

Reply via email to