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

Timestamp:

2011-01-08T18:51:31Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

15be932

Parents:

8f748215 (diff), a523af4 (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 main branch

File:

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

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

@@ -483 +483 @@
         des_proto = des_hw + header->hardware_length;
         trans = arp_addr_find(&proto->addresses, (char *) src_proto,
-            CONVERT_SIZE(uint8_t, char, header->protocol_length));
+            header->protocol_length);
         /* Exists? */
         if (trans && trans->hw_addr) {
-                if (trans->hw_addr->length != CONVERT_SIZE(uint8_t, char,
-                    header->hardware_length)) {
+                if (trans->hw_addr->length != header->hardware_length)
                         return EINVAL;
-                }
                 memcpy(trans->hw_addr->value, src_hw, trans->hw_addr->length);
         }
         /* Is my protocol address? */
-        if (proto->addr->length != CONVERT_SIZE(uint8_t, char,
-            header->protocol_length)) {
+        if (proto->addr->length != header->protocol_length)
                 return EINVAL;
-        }
         if (!str_lcmp(proto->addr->value, (char *) des_proto,
             proto->addr->length)) {
@@ -507 +503 @@
                         fibril_condvar_initialize(&trans->cv);
                         rc = arp_addr_add(&proto->addresses, (char *) src_proto,
-                            CONVERT_SIZE(uint8_t, char, header->protocol_length),
-                            trans);
+                            header->protocol_length, trans);
                         if (rc != EOK) {
                                 /* The generic char map has already freed trans! */
@@ -516 +511 @@
                 if (!trans->hw_addr) {
                         trans->hw_addr = measured_string_create_bulk(
-                            (char *) src_hw, CONVERT_SIZE(uint8_t, char,
-                            header->hardware_length));
+                            (char *) src_hw, header->hardware_length);
                         if (!trans->hw_addr)
                                 return ENOMEM;
@@ -606 +600 @@
 
         /* ARP packet content size = header + (address + translation) * 2 */
-        length = 8 + 2 * (CONVERT_SIZE(char, uint8_t, proto->addr->length) +
-            CONVERT_SIZE(char, uint8_t, device->addr->length));
+        length = 8 + 2 * (proto->addr->length + device->addr->length);
         if (length > device->packet_dimension.content)
                 return ELIMIT;
@@ -640 +633 @@
 
         rc = packet_set_addr(packet, (uint8_t *) device->addr->value,
-            (uint8_t *) device->broadcast_addr->value,
-            CONVERT_SIZE(char, uint8_t, device->addr->length));
+            (uint8_t *) device->broadcast_addr->value, device->addr->length);
         if (rc != EOK) {
                 pq_release_remote(arp_globals.net_phone, packet_get_id(packet));