1 files changed, 1 insertions, 79 deletions
diff --git a/include/linux/if_fddi.h b/include/linux/if_fddi.h
index e6dc11e7f9a5..f5550b3eeeab 100644
--- a/include/linux/if_fddi.h
+++ b/include/linux/if_fddi.h
@@ -24,84 +24,8 @@
 #ifndef _LINUX_IF_FDDI_H
 #define _LINUX_IF_FDDI_H
-#include <linux/types.h>
-/*
- *  Define max and min legal sizes.  The frame sizes do not include
- *  4 byte FCS/CRC (frame check sequence).
- */
-#define FDDI_K_ALEN                     6               /* Octets in one FDDI address */
-#define FDDI_K_8022_HLEN        16              /* Total octets in 802.2 header */
-#define FDDI_K_SNAP_HLEN        21              /* Total octets in 802.2 SNAP header */
-#define FDDI_K_8022_ZLEN        16              /* Min octets in 802.2 frame sans FCS */
-#define FDDI_K_SNAP_ZLEN        21              /* Min octets in 802.2 SNAP frame sans FCS */
-#define FDDI_K_8022_DLEN        4475    /* Max octets in 802.2 payload */
-#define FDDI_K_SNAP_DLEN        4470    /* Max octets in 802.2 SNAP payload */
-#define FDDI_K_LLC_ZLEN         13              /* Min octets in LLC frame sans FCS */
-#define FDDI_K_LLC_LEN          4491    /* Max octets in LLC frame sans FCS */
-/* Define FDDI Frame Control (FC) Byte values */
-#define FDDI_FC_K_VOID                                  0x00    
-#define FDDI_FC_K_NON_RESTRICTED_TOKEN  0x80    
-#define FDDI_FC_K_RESTRICTED_TOKEN              0xC0    
-#define FDDI_FC_K_SMT_MIN                               0x41
-#define FDDI_FC_K_SMT_MAX                               0x4F
-#define FDDI_FC_K_MAC_MIN                               0xC1
-#define FDDI_FC_K_MAC_MAX                               0xCF    
-#define FDDI_FC_K_ASYNC_LLC_MIN                 0x50
-#define FDDI_FC_K_ASYNC_LLC_DEF                 0x54
-#define FDDI_FC_K_ASYNC_LLC_MAX                 0x5F
-#define FDDI_FC_K_SYNC_LLC_MIN                  0xD0
-#define FDDI_FC_K_SYNC_LLC_MAX                  0xD7
-#define FDDI_FC_K_IMPLEMENTOR_MIN               0x60
-#define FDDI_FC_K_IMPLEMENTOR_MAX               0x6F
-#define FDDI_FC_K_RESERVED_MIN                  0x70
-#define FDDI_FC_K_RESERVED_MAX                  0x7F
-/* Define LLC and SNAP constants */
-#define FDDI_EXTENDED_SAP       0xAA
-#define FDDI_UI_CMD                     0x03
-/* Define 802.2 Type 1 header */
-struct fddi_8022_1_hdr {
-        __u8    dsap;                                   /* destination service access point */
-        __u8    ssap;                                   /* source service access point */
-        __u8    ctrl;                                   /* control byte #1 */
-} __attribute__((packed));
-/* Define 802.2 Type 2 header */
-struct fddi_8022_2_hdr {
-        __u8    dsap;                                   /* destination service access point */
-        __u8    ssap;                                   /* source service access point */
-        __u8    ctrl_1;                                 /* control byte #1 */
-        __u8    ctrl_2;                                 /* control byte #2 */
-} __attribute__((packed));
-/* Define 802.2 SNAP header */
-#define FDDI_K_OUI_LEN  3
-struct fddi_snap_hdr {
-        __u8    dsap;                                   /* always 0xAA */
-        __u8    ssap;                                   /* always 0xAA */
-        __u8    ctrl;                                   /* always 0x03 */
-        __u8    oui[FDDI_K_OUI_LEN];    /* organizational universal id */
-        __be16  ethertype;                              /* packet type ID field */
-} __attribute__((packed));
-/* Define FDDI LLC frame header */
-struct fddihdr {
-        __u8    fc;                                             /* frame control */
-        __u8    daddr[FDDI_K_ALEN];             /* destination address */
-        __u8    saddr[FDDI_K_ALEN];             /* source address */
-        union
-                {
-                struct fddi_8022_1_hdr          llc_8022_1;
-                struct fddi_8022_2_hdr          llc_8022_2;
-                struct fddi_snap_hdr            llc_snap;
-                } hdr;
-} __attribute__((packed));
-#ifdef __KERNEL__
 #include <linux/netdevice.h>
+#include <uapi/linux/if_fddi.h>
 /* Define FDDI statistics structure */
 struct fddi_statistics {
@@ -194,6 +118,4 @@ struct fddi_statistics {
        __u32   port_ler_flag[2];
        __u32   port_hardware_present[2];
 };
-#endif /* __KERNEL__ */
 #endif  /* _LINUX_IF_FDDI_H */

diff --git a/include/linux/if_fddi.h b/include/linux/if_fddi.h index e6dc11e7f9a5..f5550b3eeeab 100644 --- a/include/linux/if_fddi.h +++ b/include/linux/if_fddi.h
@@ -24,84 +24,8 @@
24	#ifndef _LINUX_IF_FDDI_H	24	#ifndef _LINUX_IF_FDDI_H
25	#define _LINUX_IF_FDDI_H	25	#define _LINUX_IF_FDDI_H
26		26
27	#include <linux/types.h>
28
29	/*
30	* Define max and min legal sizes. The frame sizes do not include
31	* 4 byte FCS/CRC (frame check sequence).
32	*/
33	#define FDDI_K_ALEN 6 /* Octets in one FDDI address */
34	#define FDDI_K_8022_HLEN 16 /* Total octets in 802.2 header */
35	#define FDDI_K_SNAP_HLEN 21 /* Total octets in 802.2 SNAP header */
36	#define FDDI_K_8022_ZLEN 16 /* Min octets in 802.2 frame sans FCS */
37	#define FDDI_K_SNAP_ZLEN 21 /* Min octets in 802.2 SNAP frame sans FCS */
38	#define FDDI_K_8022_DLEN 4475 /* Max octets in 802.2 payload */
39	#define FDDI_K_SNAP_DLEN 4470 /* Max octets in 802.2 SNAP payload */
40	#define FDDI_K_LLC_ZLEN 13 /* Min octets in LLC frame sans FCS */
41	#define FDDI_K_LLC_LEN 4491 /* Max octets in LLC frame sans FCS */
42
43	/* Define FDDI Frame Control (FC) Byte values */
44	#define FDDI_FC_K_VOID 0x00
45	#define FDDI_FC_K_NON_RESTRICTED_TOKEN 0x80
46	#define FDDI_FC_K_RESTRICTED_TOKEN 0xC0
47	#define FDDI_FC_K_SMT_MIN 0x41
48	#define FDDI_FC_K_SMT_MAX 0x4F
49	#define FDDI_FC_K_MAC_MIN 0xC1
50	#define FDDI_FC_K_MAC_MAX 0xCF
51	#define FDDI_FC_K_ASYNC_LLC_MIN 0x50
52	#define FDDI_FC_K_ASYNC_LLC_DEF 0x54
53	#define FDDI_FC_K_ASYNC_LLC_MAX 0x5F
54	#define FDDI_FC_K_SYNC_LLC_MIN 0xD0
55	#define FDDI_FC_K_SYNC_LLC_MAX 0xD7
56	#define FDDI_FC_K_IMPLEMENTOR_MIN 0x60
57	#define FDDI_FC_K_IMPLEMENTOR_MAX 0x6F
58	#define FDDI_FC_K_RESERVED_MIN 0x70
59	#define FDDI_FC_K_RESERVED_MAX 0x7F
60
61	/* Define LLC and SNAP constants */
62	#define FDDI_EXTENDED_SAP 0xAA
63	#define FDDI_UI_CMD 0x03
64
65	/* Define 802.2 Type 1 header */
66	struct fddi_8022_1_hdr {
67	__u8 dsap; /* destination service access point */
68	__u8 ssap; /* source service access point */
69	__u8 ctrl; /* control byte #1 */
70	} __attribute__((packed));
71
72	/* Define 802.2 Type 2 header */
73	struct fddi_8022_2_hdr {
74	__u8 dsap; /* destination service access point */
75	__u8 ssap; /* source service access point */
76	__u8 ctrl_1; /* control byte #1 */
77	__u8 ctrl_2; /* control byte #2 */
78	} __attribute__((packed));
79
80	/* Define 802.2 SNAP header */
81	#define FDDI_K_OUI_LEN 3
82	struct fddi_snap_hdr {
83	__u8 dsap; /* always 0xAA */
84	__u8 ssap; /* always 0xAA */
85	__u8 ctrl; /* always 0x03 */
86	__u8 oui[FDDI_K_OUI_LEN]; /* organizational universal id */
87	__be16 ethertype; /* packet type ID field */
88	} __attribute__((packed));
89
90	/* Define FDDI LLC frame header */
91	struct fddihdr {
92	__u8 fc; /* frame control */
93	__u8 daddr[FDDI_K_ALEN]; /* destination address */
94	__u8 saddr[FDDI_K_ALEN]; /* source address */
95	union
96	{
97	struct fddi_8022_1_hdr llc_8022_1;
98	struct fddi_8022_2_hdr llc_8022_2;
99	struct fddi_snap_hdr llc_snap;
100	} hdr;
101	} __attribute__((packed));
102
103	#ifdef __KERNEL__
104	#include <linux/netdevice.h>	27	#include <linux/netdevice.h>
		28	#include <uapi/linux/if_fddi.h>
105		29
106	/* Define FDDI statistics structure */	30	/* Define FDDI statistics structure */
107	struct fddi_statistics {	31	struct fddi_statistics {
@@ -194,6 +118,4 @@ struct fddi_statistics {
194	__u32 port_ler_flag[2];	118	__u32 port_ler_flag[2];
195	__u32 port_hardware_present[2];	119	__u32 port_hardware_present[2];
196	};	120	};
197	#endif /* __KERNEL__ */
198
199	#endif /* _LINUX_IF_FDDI_H */	121	#endif /* _LINUX_IF_FDDI_H */