1 files changed, 32 insertions, 40 deletions
diff --git a/drivers/char/rio/pkt.h b/drivers/char/rio/pkt.h
index 66bb2ff0f694..882fd429ac2e 100644
--- a/drivers/char/rio/pkt.h
+++ b/drivers/char/rio/pkt.h
@@ -69,52 +69,44 @@
 #define CONTROL_PKT_TTL_MASK (PKT_TTL_MASK << 8)
 #define CONTROL_DATA_WNDW  (DATA_WNDW << 8)
-struct PKT    {
+struct PKT {
 #ifdef INKERNEL
-                   BYTE    dest_unit ;    /* Destination Unit Id */
+        BYTE dest_unit;         /* Destination Unit Id */
-                   BYTE    dest_port ;    /* Destination POrt */
+        BYTE dest_port;         /* Destination POrt */
-                   BYTE    src_unit ;     /* Source Unit Id */
+        BYTE src_unit;          /* Source Unit Id */
-                   BYTE    src_port ;     /* Source POrt */
+        BYTE src_port;          /* Source POrt */
 #else
-                   union       
+        union {
-                   {
+                ushort destination;     /* Complete destination */
-                       ushort destination;         /* Complete destination */
+                struct {
-                       struct
+                        unsigned char unit;     /* Destination unit */
-                       {
+                        unsigned char port;     /* Destination port */
-                           unsigned char unit;     /* Destination unit */
+                } s1;
-                           unsigned char port;     /* Destination port */
+        } u1;
-                       } s1;
+        union {
-                   } u1;
+                ushort source;  /* Complete source */
-                   union       
+                struct {
-                   {
+                        unsigned char unit;     /* Source unit */
-                       ushort source;              /* Complete source */
+                        unsigned char port;     /* Source port */
-                       struct
+                } s2;
-                       {
+        } u2;
-                           unsigned char unit;     /* Source unit */
-                           unsigned char port;     /* Source port */
-                       } s2;
-                   } u2;
 #endif
 #ifdef INKERNEL
-                   BYTE len ;
+        BYTE len;
-                   BYTE control;
+        BYTE control;
 #else
-                   union
+        union {
-                   {
+                ushort control;
-                        ushort      control;
+                struct {
-                        struct
+                        unsigned char len;
-                        {
+                        unsigned char control;
-                            unsigned char len;
+                } s3;
-                            unsigned char control;
+        } u3;
-                        } s3;
-                    } u3;
 #endif
-                   BYTE    data[PKT_MAX_DATA_LEN] ;     
+        BYTE data[PKT_MAX_DATA_LEN];
-                                                   /* Actual data :-) */
+        /* Actual data :-) */
-                   WORD  csum ;                  /* C-SUM */
+        WORD csum;              /* C-SUM */
-               } ;
+};
 #endif
 /*********** end of file ***********/

diff --git a/drivers/char/rio/pkt.h b/drivers/char/rio/pkt.h index 66bb2ff0f694..882fd429ac2e 100644 --- a/drivers/char/rio/pkt.h +++ b/drivers/char/rio/pkt.h
@@ -69,52 +69,44 @@
69	#define CONTROL_PKT_TTL_MASK (PKT_TTL_MASK << 8)	69	#define CONTROL_PKT_TTL_MASK (PKT_TTL_MASK << 8)
70	#define CONTROL_DATA_WNDW (DATA_WNDW << 8)	70	#define CONTROL_DATA_WNDW (DATA_WNDW << 8)
71		71
72	struct PKT {	72	struct PKT {
73	#ifdef INKERNEL	73	#ifdef INKERNEL
74	BYTE dest_unit ; /* Destination Unit Id */	74	BYTE dest_unit; /* Destination Unit Id */
75	BYTE dest_port ; /* Destination POrt */	75	BYTE dest_port; /* Destination POrt */
76	BYTE src_unit ; /* Source Unit Id */	76	BYTE src_unit; /* Source Unit Id */
77	BYTE src_port ; /* Source POrt */	77	BYTE src_port; /* Source POrt */
78	#else	78	#else
79	union	79	union {
80	{	80	ushort destination; /* Complete destination */
81	ushort destination; /* Complete destination */	81	struct {
82	struct	82	unsigned char unit; /* Destination unit */
83	{	83	unsigned char port; /* Destination port */
84	unsigned char unit; /* Destination unit */	84	} s1;
85	unsigned char port; /* Destination port */	85	} u1;
86	} s1;	86	union {
87	} u1;	87	ushort source; /* Complete source */
88	union	88	struct {
89	{	89	unsigned char unit; /* Source unit */
90	ushort source; /* Complete source */	90	unsigned char port; /* Source port */
91	struct	91	} s2;
92	{	92	} u2;
93	unsigned char unit; /* Source unit */
94	unsigned char port; /* Source port */
95	} s2;
96	} u2;
97	#endif	93	#endif
98	#ifdef INKERNEL	94	#ifdef INKERNEL
99	BYTE len ;	95	BYTE len;
100	BYTE control;	96	BYTE control;
101	#else	97	#else
102	union	98	union {
103	{	99	ushort control;
104	ushort control;	100	struct {
105	struct	101	unsigned char len;
106	{	102	unsigned char control;
107	unsigned char len;	103	} s3;
108	unsigned char control;	104	} u3;
109	} s3;
110	} u3;
111	#endif	105	#endif
112	BYTE data[PKT_MAX_DATA_LEN] ;	106	BYTE data[PKT_MAX_DATA_LEN];
113	/* Actual data :-) */	107	/* Actual data :-) */
114	WORD csum ; /* C-SUM */	108	WORD csum; /* C-SUM */
115	} ;	109	};
116	#endif	110	#endif
117		111
118	/********* end of file *********/	112	/********* end of file *********/
119
120