ehea: Fix DLPAR memory add support

[~andy/linux] / drivers / char / rio / pkt.h

diff --git a/drivers/char/rio/pkt.h b/drivers/char/rio/pkt.h
index 882fd429ac2ef44494da9787cd0fff1b23db9f34..a9458164f02f22ed6e91cab1ed937797be60454d 100644 (file)
--- a/drivers/char/rio/pkt.h
+++ b/drivers/char/rio/pkt.h
@@ -37,14 +37,6 @@
 #ifndef _pkt_h
 #define _pkt_h 1
 
-
-#ifdef SCCS_LABELS
-#ifndef lint
-/* static char *_rio_pkt_h_sccs = "@(#)pkt.h   1.8"; */
-#endif
-#endif
-
-#define MAX_TTL         0xf
 #define PKT_CMD_BIT     ((ushort) 0x080)
 #define PKT_CMD_DATA    ((ushort) 0x080)
 
@@ -70,42 +62,15 @@
 #define CONTROL_DATA_WNDW  (DATA_WNDW << 8)
 
 struct PKT {
-#ifdef INKERNEL
-       BYTE dest_unit;         /* Destination Unit Id */
-       BYTE dest_port;         /* Destination POrt */
-       BYTE src_unit;          /* Source Unit Id */
-       BYTE src_port;          /* Source POrt */
-#else
-       union {
-               ushort destination;     /* Complete destination */
-               struct {
-                       unsigned char unit;     /* Destination unit */
-                       unsigned char port;     /* Destination port */
-               } s1;
-       } u1;
-       union {
-               ushort source;  /* Complete source */
-               struct {
-                       unsigned char unit;     /* Source unit */
-                       unsigned char port;     /* Source port */
-               } s2;
-       } u2;
-#endif
-#ifdef INKERNEL
-       BYTE len;
-       BYTE control;
-#else
-       union {
-               ushort control;
-               struct {
-                       unsigned char len;
-                       unsigned char control;
-               } s3;
-       } u3;
-#endif
-       BYTE data[PKT_MAX_DATA_LEN];
+       u8 dest_unit;           /* Destination Unit Id */
+       u8 dest_port;           /* Destination POrt */
+       u8 src_unit;            /* Source Unit Id */
+       u8 src_port;            /* Source POrt */
+       u8 len;
+       u8 control;
+       u8 data[PKT_MAX_DATA_LEN];
        /* Actual data :-) */
-       WORD csum;              /* C-SUM */
+       u16 csum;               /* C-SUM */
 };
 #endif