From owner-cvs-all@FreeBSD.ORG  Mon Aug 15 09:52:23 2005
Return-Path: <owner-cvs-all@FreeBSD.ORG>
X-Original-To: cvs-all@FreeBSD.org
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 72FE016A41F;
	Mon, 15 Aug 2005 09:52:23 +0000 (GMT)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2F00A43D45;
	Mon, 15 Aug 2005 09:52:23 +0000 (GMT)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j7F9qNgX039199;
	Mon, 15 Aug 2005 09:52:23 GMT
	(envelope-from rwatson@repoman.freebsd.org)
Received: (from rwatson@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j7F9qNeu039198;
	Mon, 15 Aug 2005 09:52:23 GMT (envelope-from rwatson)
Message-Id: <200508150952.j7F9qNeu039198@repoman.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Mon, 15 Aug 2005 09:52:23 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_6
Cc: 
Subject: cvs commit: src/sys/netnatm natm.c natm.h natm_proto.c
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 15 Aug 2005 09:52:23 -0000

rwatson     2005-08-15 09:52:23 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_6)
    sys/netnatm          natm.c natm.h natm_proto.c 
  Log:
  Merge natm.c:1.39, natm.h:1.12, natm_proto.c:1.17 from HEAD to RELENG_6:
  
    Remove FreeBSD 2.2 protocol usrreq compatibility code.
  
    Remove minor #ifdefs for early NetBSD and OpenBSD compatibility.
  
    Remove spl-related definitions.
  
  Approved by:    re (hrs)
  
  Revision  Changes    Path
  1.37.2.2  +1 -280    src/sys/netnatm/natm.c
  1.10.2.2  +0 -25     src/sys/netnatm/natm.h
  1.15.2.2  +0 -26     src/sys/netnatm/natm_proto.c