diff options
Diffstat (limited to 'include/linux/if_fddi.h')
-rw-r--r-- | include/linux/if_fddi.h | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/include/linux/if_fddi.h b/include/linux/if_fddi.h index 45de1046dbbf..5459c5c09930 100644 --- a/include/linux/if_fddi.h +++ b/include/linux/if_fddi.h | |||
@@ -63,36 +63,32 @@ | |||
63 | #define FDDI_UI_CMD 0x03 | 63 | #define FDDI_UI_CMD 0x03 |
64 | 64 | ||
65 | /* Define 802.2 Type 1 header */ | 65 | /* Define 802.2 Type 1 header */ |
66 | struct fddi_8022_1_hdr | 66 | struct fddi_8022_1_hdr { |
67 | { | ||
68 | __u8 dsap; /* destination service access point */ | 67 | __u8 dsap; /* destination service access point */ |
69 | __u8 ssap; /* source service access point */ | 68 | __u8 ssap; /* source service access point */ |
70 | __u8 ctrl; /* control byte #1 */ | 69 | __u8 ctrl; /* control byte #1 */ |
71 | } __attribute__ ((packed)); | 70 | } __attribute__ ((packed)); |
72 | 71 | ||
73 | /* Define 802.2 Type 2 header */ | 72 | /* Define 802.2 Type 2 header */ |
74 | struct fddi_8022_2_hdr | 73 | struct fddi_8022_2_hdr { |
75 | { | ||
76 | __u8 dsap; /* destination service access point */ | 74 | __u8 dsap; /* destination service access point */ |
77 | __u8 ssap; /* source service access point */ | 75 | __u8 ssap; /* source service access point */ |
78 | __u8 ctrl_1; /* control byte #1 */ | 76 | __u8 ctrl_1; /* control byte #1 */ |
79 | __u8 ctrl_2; /* control byte #2 */ | 77 | __u8 ctrl_2; /* control byte #2 */ |
80 | } __attribute__ ((packed)); | 78 | } __attribute__ ((packed)); |
81 | 79 | ||
82 | /* Define 802.2 SNAP header */ | 80 | /* Define 802.2 SNAP header */ |
83 | #define FDDI_K_OUI_LEN 3 | 81 | #define FDDI_K_OUI_LEN 3 |
84 | struct fddi_snap_hdr | 82 | struct fddi_snap_hdr { |
85 | { | ||
86 | __u8 dsap; /* always 0xAA */ | 83 | __u8 dsap; /* always 0xAA */ |
87 | __u8 ssap; /* always 0xAA */ | 84 | __u8 ssap; /* always 0xAA */ |
88 | __u8 ctrl; /* always 0x03 */ | 85 | __u8 ctrl; /* always 0x03 */ |
89 | __u8 oui[FDDI_K_OUI_LEN]; /* organizational universal id */ | 86 | __u8 oui[FDDI_K_OUI_LEN]; /* organizational universal id */ |
90 | __be16 ethertype; /* packet type ID field */ | 87 | __be16 ethertype; /* packet type ID field */ |
91 | } __attribute__ ((packed)); | 88 | } __attribute__ ((packed)); |
92 | 89 | ||
93 | /* Define FDDI LLC frame header */ | 90 | /* Define FDDI LLC frame header */ |
94 | struct fddihdr | 91 | struct fddihdr { |
95 | { | ||
96 | __u8 fc; /* frame control */ | 92 | __u8 fc; /* frame control */ |
97 | __u8 daddr[FDDI_K_ALEN]; /* destination address */ | 93 | __u8 daddr[FDDI_K_ALEN]; /* destination address */ |
98 | __u8 saddr[FDDI_K_ALEN]; /* source address */ | 94 | __u8 saddr[FDDI_K_ALEN]; /* source address */ |
@@ -102,7 +98,7 @@ struct fddihdr | |||
102 | struct fddi_8022_2_hdr llc_8022_2; | 98 | struct fddi_8022_2_hdr llc_8022_2; |
103 | struct fddi_snap_hdr llc_snap; | 99 | struct fddi_snap_hdr llc_snap; |
104 | } hdr; | 100 | } hdr; |
105 | } __attribute__ ((packed)); | 101 | } __attribute__ ((packed)); |
106 | 102 | ||
107 | #ifdef __KERNEL__ | 103 | #ifdef __KERNEL__ |
108 | #include <linux/netdevice.h> | 104 | #include <linux/netdevice.h> |
@@ -197,7 +193,7 @@ struct fddi_statistics { | |||
197 | __u32 port_pc_withhold[2]; | 193 | __u32 port_pc_withhold[2]; |
198 | __u32 port_ler_flag[2]; | 194 | __u32 port_ler_flag[2]; |
199 | __u32 port_hardware_present[2]; | 195 | __u32 port_hardware_present[2]; |
200 | }; | 196 | }; |
201 | #endif /* __KERNEL__ */ | 197 | #endif /* __KERNEL__ */ |
202 | 198 | ||
203 | #endif /* _LINUX_IF_FDDI_H */ | 199 | #endif /* _LINUX_IF_FDDI_H */ |