xnu-792.24.17.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..536b68e8b808f77d60491c347b5cce932b5bc4c2 100644 (file)
--- a/bsd/net/if_llc.h
+++ b/bsd/net/if_llc.h
@@ -3,22 +3,19 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * 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. 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
+ * This 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,
- * 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.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
@@ -76,7 +73,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 +108,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