xnu-1228.9.59.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 5b2a9bfee65ba4454ca7a44318b3abb939b0c431..0fa54144fb381a986fc81960c634701e787fc320 100644 (file)
--- a/bsd/netinet/if_atm.c
+++ b/bsd/netinet/if_atm.c
@@ -1,16 +1,19 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *

- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@

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


@@ -20,7 +23,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
  * 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 $       */
 


@@ -175,8 +178,7 @@ atm_rtrequest(req, rt, sa)
                 */
                bcopy(LLADDR(SDL(gate)), &api.aph, sizeof(api.aph));
                api.rxhand = NULL;
                 */
                bcopy(LLADDR(SDL(gate)), &api.aph, sizeof(api.aph));
                api.rxhand = NULL;

-               if (dlil_ioctl(0, rt->rt_ifp, SIOCATMENA, 
-                                                       (caddr_t)&api) != 0) {
+               if (ifnet_ioctl(rt->rt_ifpm 0, SIOCATMENA, &api) != 0) {

                        printf("atm: couldn't add VC\n");
                        goto failed;
                }
                        printf("atm: couldn't add VC\n");
                        goto failed;
                }


@@ -218,8 +220,7 @@ failed:
 
                bcopy(LLADDR(SDL(gate)), &api.aph, sizeof(api.aph));
                api.rxhand = NULL;
 
                bcopy(LLADDR(SDL(gate)), &api.aph, sizeof(api.aph));
                api.rxhand = NULL;

-               dlil_ioctl(0, rt->rt_ifp, SIOCATMDIS, 
-                                                       (caddr_t)&api);
+               ifnet_ioctl(rt->rt_ifp, 0, SIOCATMDIS, &api);

 
                break;
        }
 
                break;
        }