Changeset 71b00dcc in mainline for uspace/srv/net/include/device.h

Timestamp:

2010-03-07T22:51:38Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

60ab6c3

Parents:

b5cbff4 (diff), 31c80a5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:~lukasmejdrech/helenos/network.

File:

• uspace/srv/net/include/device.h (modified) (2 diffs)

uspace/srv/net/include/device.h

@@ -50 +50 @@
 /** Invalid device identifier.
  */
-#define DEVICE_INVALID_ID               ( -1 )
+#define DEVICE_INVALID_ID               (-1)
 
 /** Device identifier type.
@@ -92 +92 @@
         /** Total packets received.
          */
-        unsigned long   receive_packets;
+        unsigned long receive_packets;
         /** Total packets transmitted.
          */
-        unsigned long   send_packets;
+        unsigned long send_packets;
         /** Total bytes received.
          */
-        unsigned long   receive_bytes;
+        unsigned long receive_bytes;
         /** Total bytes transmitted.
          */
-        unsigned long   send_bytes;
+        unsigned long send_bytes;
         /** Bad packets received counter.
          */
-        unsigned long   receive_errors;
+        unsigned long receive_errors;
         /** Packet transmition problems counter.
          */
-        unsigned long   send_errors;
+        unsigned long send_errors;
         /** No space in buffers counter.
          */
-        unsigned long   receive_dropped;
+        unsigned long receive_dropped;
         /** No space available counter.
          */
-        unsigned long   send_dropped;
+        unsigned long send_dropped;
         /** Total multicast packets received.
          */
-        unsigned long   multicast;
+        unsigned long multicast;
         /** The number of collisions due to congestion on the medium.
          */
-        unsigned long   collisions;
+        unsigned long collisions;
 
         /* detailed receive_errors: */
         /** Received packet length error counter.
          */
-        unsigned long   receive_length_errors;
+        unsigned long receive_length_errors;
         /** Receiver buffer overflow counter.
          */
-        unsigned long   receive_over_errors;
+        unsigned long receive_over_errors;
         /** Received packet with crc error counter.
          */
-        unsigned long   receive_crc_errors;
+        unsigned long receive_crc_errors;
         /** Received frame alignment error counter.
          */
-        unsigned long   receive_frame_errors;
+        unsigned long receive_frame_errors;
         /** Receiver fifo overrun counter.
          */
-        unsigned long   receive_fifo_errors;
+        unsigned long receive_fifo_errors;
         /** Receiver missed packet counter.
          */
-        unsigned long   receive_missed_errors;
+        unsigned long receive_missed_errors;
 
         /* detailed send_errors */
         /** Transmitter aborted counter.
          */
-        unsigned long   send_aborted_errors;
+        unsigned long send_aborted_errors;
         /** Transmitter carrier errors counter.
          */
-        unsigned long   send_carrier_errors;
+        unsigned long send_carrier_errors;
         /** Transmitter fifo overrun counter.
          */
-        unsigned long   send_fifo_errors;
+        unsigned long send_fifo_errors;
         /** Transmitter carrier errors counter.
          */
-        unsigned long   send_heartbeat_errors;
+        unsigned long send_heartbeat_errors;
         /** Transmitter window errors counter.
          */
-        unsigned long   send_window_errors;
+        unsigned long send_window_errors;
 
         /* for cslip etc */
         /** Total compressed packets received.
          */
-        unsigned long   receive_compressed;
+        unsigned long receive_compressed;
         /** Total compressed packet transmitted.
          */
-        unsigned long   send_compressed;
+        unsigned long send_compressed;
 };