Changeset 80ce111 in mainline for uspace/srv/net/nil/eth/eth.c

Timestamp:

2010-02-16T18:08:45Z (15 years ago)

Author:

Lukas Mejdrech <lukasmejdrech@…>

Branches:

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

Children:

01a9ef5

Parents:

a70bda4

Message:

• dummy Ethernet fix

File:

• uspace/srv/net/nil/eth/eth.c (modified) (2 diffs)

uspace/srv/net/nil/eth/eth.c

@@ -585 +585 @@
                 if( ! padding ) return ENOMEM;
                 bzero( padding, ETH_MIN_TAGGED_CONTENT( flags ) - length );
-        }
-        if( IS_DUMMY( flags )){
-                preamble = PACKET_PREFIX( packet, eth_preamble_t );
-                if( ! preamble ) return ENOMEM;
-                for( i = 0; i < 7; ++ i ) preamble->preamble[ i ] = ETH_PREAMBLE;
-                preamble->sfd = ETH_SFD;
         }
         if( IS_DIX( flags )){
@@ -623 +617 @@
         }
         if( IS_DUMMY( flags )){
+                preamble = PACKET_PREFIX( packet, eth_preamble_t );
+                if( ! preamble ) return ENOMEM;
+                for( i = 0; i < 7; ++ i ) preamble->preamble[ i ] = ETH_PREAMBLE;
+                preamble->sfd = ETH_SFD;
                 fcs = PACKET_SUFFIX( packet, eth_fcs_t );
                 if( ! fcs ) return ENOMEM;