xnu-792.17.14.tar.gz

[apple/xnu.git] / bsd / netinet / if_atm.c

diff --git a/bsd/netinet/if_atm.c b/bsd/netinet/if_atm.c
index cfc61835f842ee16c82850b29f36328ed69dc6c5..5418f59266a0762626ff665d1489d8d46efe19d9 100644 (file)
--- a/bsd/netinet/if_atm.c
+++ b/bsd/netinet/if_atm.c
@@ -1,23 +1,29 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *

- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@

  * 
  * 

- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.

  * 
  * 

- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER

  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.

  * 
  * 

- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@

  */
 /*      $NetBSD: if_atm.c,v 1.6 1996/10/13 02:03:01 christos Exp $       */
 
  */
 /*      $NetBSD: if_atm.c,v 1.6 1996/10/13 02:03:01 christos Exp $       */
 


@@ -51,15 +57,14 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+ *
+ * $FreeBSD: src/sys/netinet/if_atm.c,v 1.8 1999/12/07 17:39:06 shin Exp $

  */
 
 /*
  * IP <=> ATM address resolution.
  */
 
  */
 
 /*
  * IP <=> ATM address resolution.
  */
 

-#include "opt_inet.h"
-#include "opt_natm.h"
-

 #if defined(INET) || defined(INET6)
 
 #include <sys/param.h>
 #if defined(INET) || defined(INET6)
 
 #include <sys/param.h>


@@ -258,7 +263,7 @@ register struct atm_pseudohdr *desten;      /* OUT */
        if (rt == NULL) {
                rt = RTALLOC1(dst, 0);
                if (rt == NULL) goto bad; /* failed */
        if (rt == NULL) {
                rt = RTALLOC1(dst, 0);
                if (rt == NULL) goto bad; /* failed */

-               rt->rt_refcnt--;        /* don't keep LL references */
+               rtunref(rt);    /* don't keep LL references */

                if ((rt->rt_flags & RTF_GATEWAY) != 0 || 
                        (rt->rt_flags & RTF_LLINFO) == 0 ||
                        /* XXX: are we using LLINFO? */
                if ((rt->rt_flags & RTF_GATEWAY) != 0 || 
                        (rt->rt_flags & RTF_LLINFO) == 0 ||
                        /* XXX: are we using LLINFO? */