PERFORCE change 149444 for review

[Ryan French]

http://perforce.freebsd.org/chv.cgi?CH=149444

Change 149444 by rfrench at rfrench_mpls on 2008/09/08 20:49:01

	Stil trying to work through why my code isnt being called when the if_ethersubr.c demuxer is run.

Affected files ...

.. //depot/projects/soc2008/rfrench_mpls/net/if_ethersubr.c#7 edit
.. //depot/projects/soc2008/rfrench_mpls/netmpls/mpls.h#5 edit
.. //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_input.c#5 edit
.. //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_proto.c#5 edit
.. //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_raw.c#5 edit
.. //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_shim.c#3 edit

Differences ...

==== //depot/projects/soc2008/rfrench_mpls/net/if_ethersubr.c#7 (text+ko) ====


==== //depot/projects/soc2008/rfrench_mpls/netmpls/mpls.h#5 (text+ko) ====

@@ -40,9 +40,6 @@
 #include <net/if.h>
 #include <net/if_dl.h>
 
-#define MPLS
-#define MPLS_DEBUG
-
 /*
  * Structure of a SHIM header.
  */

==== //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_input.c#5 (text+ko) ====

@@ -15,6 +15,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include "opt_mpls.h"
+
 #include <sys/param.h>
 #include <sys/mbuf.h>
 #include <sys/systm.h>

==== //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_proto.c#5 (text+ko) ====

@@ -28,6 +28,8 @@
  * SUCH DAMAGE.
  */
  
+#include "opt_mpls.h"
+ 
 #include <sys/cdefs.h>
 
 #include <sys/param.h>
@@ -48,9 +50,6 @@
  * MPLS protocol family:
  */
 
-#define MPLS
-#define MPLS_DEBUG
-
 extern struct domain mplsdomain;
 extern struct pr_usrreqs mpls_raw_usrreq;
 

==== //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_raw.c#5 (text+ko) ====

@@ -28,7 +28,9 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
  * SUCH DAMAGE.
  */
-
+ 
+#include "opt_mpls.h"
+ 
 #include <sys/param.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>

==== //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_shim.c#3 (text+ko) ====

@@ -28,6 +28,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
  * SUCH DAMAGE.
  */
+ 
+#include "opt_mpls.h"
 
 #include <sys/param.h>
 #include <sys/malloc.h>