From owner-svn-src-stable@FreeBSD.ORG  Mon Aug 20 14:42:29 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id B75D1106566B;
	Mon, 20 Aug 2012 14:42: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 A15578FC14;
	Mon, 20 Aug 2012 14:42: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 q7KEgT8T048393;
	Mon, 20 Aug 2012 14:42:29 GMT (envelope-from emaste@svn.freebsd.org)
Received: (from emaste@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7KEgTgl048391;
	Mon, 20 Aug 2012 14:42:29 GMT (envelope-from emaste@svn.freebsd.org)
Message-Id: <201208201442.q7KEgTgl048391@svn.freebsd.org>
From: Ed Maste <emaste@FreeBSD.org>
Date: Mon, 20 Aug 2012 14:42:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r239430 - stable/9/sys/netinet
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 20 Aug 2012 14:42:29 -0000

Author: emaste
Date: Mon Aug 20 14:42:29 2012
New Revision: 239430
URL: http://svn.freebsd.org/changeset/base/239430

Log:
  MFC r236157: 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:
  stable/9/sys/netinet/in.h
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/netinet/in.h
==============================================================================
--- stable/9/sys/netinet/in.h	Mon Aug 20 14:37:50 2012	(r239429)
+++ stable/9/sys/netinet/in.h	Mon Aug 20 14:42:29 2012	(r239430)
@@ -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 */