xnu-792.17.14.tar.gz

[apple/xnu.git] / bsd / net / if_llc.h

diff --git a/bsd/net/if_llc.h b/bsd/net/if_llc.h
index 16b8b3ef9ea1591e608dba9680a55f8452981eed..7b0d446e2d92c2ece31bfa5b4230fee59f9fa863 100644 (file)
--- a/bsd/net/if_llc.h
+++ b/bsd/net/if_llc.h
@@ -1,16 +1,19 @@
 /*
  * 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
- * 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
@@ -20,7 +23,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * Copyright (c) 1988, 1993
@@ -76,7 +79,7 @@ struct llc {
            struct {
                u_char control;
                u_char format_id;
-               u_char class;
+               u_char class_id;
                u_char window_x2;
            } type_u;
            struct {
@@ -111,7 +114,7 @@ struct llc {
 #define llc_control            llc_un.type_u.control
 #define        llc_control_ext        llc_un.type_raw.control_ext
 #define llc_fid                llc_un.type_u.format_id
-#define llc_class              llc_un.type_u.class
+#define llc_class              llc_un.type_u.class_id
 #define llc_window             llc_un.type_u.window_x2
 #define llc_frmrinfo           llc_un.type_frmr.frmrinfo
 #define llc_frmr_pdu0          llc_un.type_frmr.frmrinfo.rej_pdu0