Changeset 858fc90 in mainline for uspace/srv/net/nil/eth/eth_header.h

Timestamp:

2010-03-15T19:35:25Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

6092b56e

Parents:

92307f1 (diff), 4684368 (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 bzr://bzr.helenos.org/head.

File:

• uspace/srv/net/nil/eth/eth_header.h (modified) (6 diffs)

uspace/srv/net/nil/eth/eth_header.h

@@ -121 +121 @@
 struct eth_ieee_lsap{
         /** Destination Service Access Point identifier.
-         *      The possible values are assigned by an IEEE committee.
-         */
-        uint8_t         dsap;
+         * The possible values are assigned by an IEEE committee.
+         */
+        uint8_t dsap;
         /** Source Service Access Point identifier.
-         *      The possible values are assigned by an IEEE committee.
-         */
-        uint8_t         ssap;
+         * The possible values are assigned by an IEEE committee.
+         */
+        uint8_t ssap;
         /** Control parameter.
-         *      The possible values are assigned by an IEEE committee.
-         */
-        uint8_t         ctrl;
+         * The possible values are assigned by an IEEE committee.
+         */
+        uint8_t ctrl;
 } __attribute__ ((packed));
 
@@ -139 +139 @@
         /** Protocol identifier or organization code.
          */
-        uint8_t         protocol[ 3 ];
+        uint8_t protocol[3];
         /** Ethernet protocol identifier in the network byte order (big endian).
          *  @see ethernet_protocols.h
          */
-        uint16_t        ethertype;
+        uint16_t ethertype;
 } __attribute__ ((packed));
 
@@ -153 +153 @@
          *  All should be set to ETH_PREAMBLE.
          */
-        uint8_t         preamble[ 7 ];
+        uint8_t preamble[7];
         /** Start of Frame Delimiter used for the frame transmission synchronization.
          *  Should be set to ETH_SFD.
          */
-        uint8_t         sfd;
+        uint8_t sfd;
 } __attribute__ ((packed));
 
@@ -165 +165 @@
         /** Destination host Ethernet address (MAC address).
          */
-        uint8_t         destination_address[ ETH_ADDR ];
+        uint8_t destination_address[ETH_ADDR];
         /** Source host Ethernet address (MAC address).
          */
-        uint8_t         source_address[ ETH_ADDR ];
+        uint8_t source_address[ETH_ADDR];
         /** Ethernet protocol identifier in the network byte order (big endian).
          *  @see ethernet_protocols.h
          */
-        uint16_t        ethertype;
+        uint16_t ethertype;
 } __attribute__ ((packed));
 
@@ -180 +180 @@
         /** Ethernet header.
          */
-        eth_header_t            header;
+        eth_header_t header;
         /** LSAP extension.
          *  If DSAP and SSAP are set to ETH_LSAP_SNAP the SNAP extension is being used.
          *  If DSAP and SSAP fields are equal to ETH_RAW the raw Ethernet packet without any extensions is being used and the frame content starts rigth after the two fields.
          */
-        eth_ieee_lsap_t         lsap;
+        eth_ieee_lsap_t lsap;
 } __attribute__ ((packed));
 
@@ -193 +193 @@
         /** Ethernet header.
          */
-        eth_header_t            header;
+        eth_header_t header;
         /** LSAP extension.
          *  If DSAP and SSAP are set to ETH_LSAP_SNAP the SNAP extension is being used.
          *  If DSAP and SSAP fields are equal to ETH_RAW the raw Ethernet packet without any extensions is being used and the frame content starts rigth after the two fields.
          */
-        eth_ieee_lsap_t         lsap;
+        eth_ieee_lsap_t lsap;
         /** SNAP extension.
          */
-        eth_snap_t                      snap;
+        eth_snap_t snap;
 } __attribute__ ((packed));