From owner-svn-src-all@FreeBSD.ORG  Sun May 27 16:16:29 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 17145106566B;
	Sun, 27 May 2012 16:16:29 +0000 (UTC)
	(envelope-from emaste@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 035658FC12;
	Sun, 27 May 2012 16:16:29 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q4RGGS8q059476;
	Sun, 27 May 2012 16:16:28 GMT (envelope-from emaste@svn.freebsd.org)
Received: (from emaste@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4RGGSiK059474;
	Sun, 27 May 2012 16:16:28 GMT (envelope-from emaste@svn.freebsd.org)
Message-Id: <201205271616.q4RGGSiK059474@svn.freebsd.org>
From: Ed Maste <emaste@FreeBSD.org>
Date: Sun, 27 May 2012 16:16:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r236157 - head/sys/netinet
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 27 May 2012 16:16:29 -0000

Author: emaste
Date: Sun May 27 16:16:28 2012
New Revision: 236157
URL: http://svn.freebsd.org/changeset/base/236157

Log:
  Add IPPROTO_MPLS (rfc4023) IP protocol definition
  
  There are currently no in-tree consumers; I'm adding it now for use by
  vendor code.  This matches the change OpenBSD made while implementing
  MPLS in gif(4).

Modified:
  head/sys/netinet/in.h

Modified: head/sys/netinet/in.h
==============================================================================
--- head/sys/netinet/in.h	Sun May 27 16:08:58 2012	(r236156)
+++ head/sys/netinet/in.h	Sun May 27 16:16:28 2012	(r236157)
@@ -241,6 +241,7 @@ __END_DECLS
 #define	IPPROTO_PIM		103		/* Protocol Independent Mcast */
 #define	IPPROTO_CARP		112		/* CARP */
 #define	IPPROTO_PGM		113		/* PGM */
+#define	IPPROTO_MPLS		137		/* MPLS-in-IP */
 #define	IPPROTO_PFSYNC		240		/* PFSYNC */
 /* 255: Reserved */
 /* BSD Private, local use, namespace incursion, no longer used */