fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / include / linux / if_fddi.h

diff --git a/include/linux/if_fddi.h b/include/linux/if_fddi.h
index 2217963..4aba6b0 100644 (file)
--- a/include/linux/if_fddi.h
+++ b/include/linux/if_fddi.h
@@ -5,7 +5,7 @@
  *
  *             Global definitions for the ANSI FDDI interface.
  *
- * Version:    @(#)if_fddi.h   1.0.1   09/16/96
+ * Version:    @(#)if_fddi.h   1.0.2   Sep 29 2004
  *
  * Author:     Lawrence V. Stefani, <stefani@lkg.dec.com>
  *
@@ -85,7 +85,7 @@ struct fddi_snap_hdr
        __u8    ssap;                                   /* always 0xAA */
        __u8    ctrl;                                   /* always 0x03 */
        __u8    oui[FDDI_K_OUI_LEN];    /* organizational universal id */
-       __u16   ethertype;                              /* packet type ID field */
+       __be16  ethertype;                              /* packet type ID field */
        } __attribute__ ((packed));
 
 /* Define FDDI LLC frame header */
@@ -102,39 +102,16 @@ struct fddihdr
                } hdr;
        } __attribute__ ((packed));
 
+#ifdef __KERNEL__
+#include <linux/netdevice.h>
+
 /* Define FDDI statistics structure */
-struct fddi_statistics
-       {
-       __u32   rx_packets;                             /* total packets received */
-       __u32   tx_packets;                             /* total packets transmitted */
-       __u32   rx_bytes;                               /* total bytes received */
-       __u32   tx_bytes;                               /* total bytes transmitted */
-       __u32   rx_errors;                              /* bad packets received */
-       __u32   tx_errors;                              /* packet transmit problems     */
-       __u32   rx_dropped;                             /* no space in linux buffers */
-       __u32   tx_dropped;                             /* no space available in linux */
-       __u32   multicast;                              /* multicast packets received */
-       __u32   transmit_collision;             /* always 0 for FDDI */
+struct fddi_statistics {
+
+       /* Generic statistics. */
 
-       /* detailed rx_errors */
-       __u32   rx_length_errors;
-       __u32   rx_over_errors;         /* receiver ring buff overflow  */
-       __u32   rx_crc_errors;          /* recved pkt with crc error    */
-       __u32   rx_frame_errors;        /* recv'd frame alignment error */
-       __u32   rx_fifo_errors;         /* recv'r fifo overrun          */
-       __u32   rx_missed_errors;       /* receiver missed packet       */
+       struct net_device_stats gen;
 
-       /* detailed tx_errors */
-       __u32   tx_aborted_errors;
-       __u32   tx_carrier_errors;
-       __u32   tx_fifo_errors;
-       __u32   tx_heartbeat_errors;
-       __u32   tx_window_errors;
-       
-       /* for cslip etc */
-       __u32   rx_compressed;
-       __u32   tx_compressed;
-   
        /* Detailed FDDI statistics.  Adopted from RFC 1512 */
 
        __u8    smt_station_id[8];
@@ -219,5 +196,6 @@ struct fddi_statistics
        __u32   port_ler_flag[2];
        __u32   port_hardware_present[2];
        };
+#endif /* __KERNEL__ */
 
 #endif /* _LINUX_IF_FDDI_H */