FDDI: Reformat <linux/if_fddi.h> for 8-character tabs

Some of our FDDI support code has been apparently written with an assumption that tabs are 4-character wide. In preparation to the next change this update reformats <linux/if_fddi.h> so that it stays within 79 columns and otherwise renders correctly with 8-character tabs. No functional change.

Maciej W. Rozycki committed 12 years ago

Commit eb110221 parent 22e79871 file · +46 −44Browse files

Showing the changes to include/uapi/linux (1 of 1 file). Show all

Unified · Split

include/uapi/linux/if_fddi.h+46−44

@@ -30,74 +30,76 @@ · 29 unmodified lines
30	30	* Define max and min legal sizes. The frame sizes do not include
31	31	* 4 byte FCS/CRC (frame check sequence).
32	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 */
	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
	37	+ FCS */
	38	+#define FDDI_K_SNAP_ZLEN 21 /* Min octets in 802.2 SNAP frame sans
	39	+ FCS */
38	40	#define FDDI_K_8022_DLEN 4475 /* Max octets in 802.2 payload */
39	41	#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 */
	42	+#define FDDI_K_LLC_ZLEN 13 /* Min octets in LLC frame sans FCS */
41	43	#define FDDI_K_LLC_LEN 4491 /* Max octets in LLC frame sans FCS */
	44	+#define FDDI_K_OUI_LEN 3 /* Octets in OUI in 802.2 SNAP
	45	+ header */
42	46
43	47	/* 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
	48	+#define FDDI_FC_K_VOID 0x00
	49	+#define FDDI_FC_K_NON_RESTRICTED_TOKEN 0x80
	50	+#define FDDI_FC_K_RESTRICTED_TOKEN 0xC0
	51	+#define FDDI_FC_K_SMT_MIN 0x41
	52	+#define FDDI_FC_K_SMT_MAX 0x4F
	53	+#define FDDI_FC_K_MAC_MIN 0xC1
	54	+#define FDDI_FC_K_MAC_MAX 0xCF
	55	+#define FDDI_FC_K_ASYNC_LLC_MIN 0x50
	56	+#define FDDI_FC_K_ASYNC_LLC_DEF 0x54
	57	+#define FDDI_FC_K_ASYNC_LLC_MAX 0x5F
	58	+#define FDDI_FC_K_SYNC_LLC_MIN 0xD0
	59	+#define FDDI_FC_K_SYNC_LLC_MAX 0xD7
	60	+#define FDDI_FC_K_IMPLEMENTOR_MIN 0x60
	61	+#define FDDI_FC_K_IMPLEMENTOR_MAX 0x6F
	62	+#define FDDI_FC_K_RESERVED_MIN 0x70
	63	+#define FDDI_FC_K_RESERVED_MAX 0x7F
60	64
61	65	/* Define LLC and SNAP constants */
62		−#define FDDI_EXTENDED_SAP 0xAA
	66	+#define FDDI_EXTENDED_SAP 0xAA
63	67	#define FDDI_UI_CMD 0x03
64	68
65	69	/* Define 802.2 Type 1 header */
66	70	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 */
	71	+ __u8 dsap; /* destination service access point */
	72	+ __u8 ssap; /* source service access point */
	73	+ __u8 ctrl; /* control byte #1 */
70	74	} __attribute__((packed));
71	75
72	76	/* Define 802.2 Type 2 header */
73	77	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	+ __u8 dsap; /* destination service access point */
	79	+ __u8 ssap; /* source service access point */
	80	+ __u8 ctrl_1; /* control byte #1 */
	81	+ __u8 ctrl_2; /* control byte #2 */
78	82	} __attribute__((packed));
79	83
80	84	/* Define 802.2 SNAP header */
81		−#define FDDI_K_OUI_LEN 3
82	85	struct fddi_snap_hdr {
83		− __u8 dsap; /* always 0xAA */
84		− __u8 ssap; /* always 0xAA */
85		− __u8 ctrl; /* always 0x03 */
	86	+ __u8 dsap; /* always 0xAA */
	87	+ __u8 ssap; /* always 0xAA */
	88	+ __u8 ctrl; /* always 0x03 */
86	89	__u8 oui[FDDI_K_OUI_LEN]; /* organizational universal id */
87		− __be16 ethertype; /* packet type ID field */
	90	+ __be16 ethertype; /* packet type ID field */
88	91	} __attribute__((packed));
89	92
90	93	/* Define FDDI LLC frame header */
91	94	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;
	95	+ __u8 fc; /* frame control */
	96	+ __u8 daddr[FDDI_K_ALEN]; /* destination address */
	97	+ __u8 saddr[FDDI_K_ALEN]; /* source address */
	98	+ union {
	99	+ struct fddi_8022_1_hdr llc_8022_1;
	100	+ struct fddi_8022_2_hdr llc_8022_2;
	101	+ struct fddi_snap_hdr llc_snap;
	102	+ } hdr;
101	103	} __attribute__((packed));
102	104
103	105