Changeset ca2d142 in mainline for uspace/srv/net/il/arp/arp.c

Timestamp:

2010-02-18T10:00:30Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e326edc

Parents:

b8da2a3 (diff), 91478aa (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 the networking branch.

File:

• uspace/srv/net/il/arp/arp.c (modified) (4 diffs)

uspace/srv/net/il/arp/arp.c

@@ -337 +337 @@
                 }
                 // get packet dimensions
-                if( ERROR_OCCURRED( nil_packet_size_req( device->phone, device_id, & device->addr_len, & device->prefix, & device->content, & device->suffix ))){
+                if( ERROR_OCCURRED( nil_packet_size_req( device->phone, device_id, & device->packet_dimension ))){
                         fibril_rwlock_write_unlock( & arp_globals.lock );
                         arp_protos_destroy( & device->protos );
@@ -392 +392 @@
         // ARP packet content size = header + ( address + translation ) * 2
         length = 8 + ( CONVERT_SIZE( char, uint8_t, proto->addr->length ) + CONVERT_SIZE( char, uint8_t, device->addr->length )) * 2;
-        if( length > device->content ) return NULL;
-        packet = packet_get_4( arp_globals.net_phone, device->addr_len, device->prefix, length, device->suffix );
+        if( length > device->packet_dimension.content ) return NULL;
+        packet = packet_get_4( arp_globals.net_phone, device->packet_dimension.addr_len, device->packet_dimension.prefix, length, device->packet_dimension.suffix );
         if( ! packet ) return NULL;
         header = ( arp_header_ref ) packet_suffix( packet, length );
@@ -472 +472 @@
                         memcpy( des_proto, src_proto, header->protocol_length );
                         memcpy( src_proto, proto->addr->value, header->protocol_length );
-                        memcpy( src_hw, device->addr->value, device->addr_len );
+                        memcpy( src_hw, device->addr->value, device->packet_dimension.addr_len );
                         memcpy( des_hw, hw_source->value, header->hardware_length );
                         ERROR_PROPAGATE( packet_set_addr( packet, src_hw, des_hw, header->hardware_length ));
@@ -511 +511 @@
                 return ENOENT;
         }
-        device->content = mtu;
+        device->packet_dimension.content = mtu;
         printf( "arp - device %d changed mtu to %d\n\n", device_id, mtu );
         fibril_rwlock_write_unlock( & arp_globals.lock );