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

Timestamp:

2011-01-09T12:18:00Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

54de5ebd

Parents:

a3eeef45 (diff), 9d12059 (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 mainline changes.

File:

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

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

@@ -482 +482 @@
         des_hw = src_proto + header->protocol_length;
         des_proto = des_hw + header->hardware_length;
-        trans = arp_addr_find(&proto->addresses, (char *) src_proto,
+        trans = arp_addr_find(&proto->addresses, src_proto,
             header->protocol_length);
         /* Exists? */
@@ -493 +493 @@
         if (proto->addr->length != header->protocol_length)
                 return EINVAL;
-        if (!str_lcmp(proto->addr->value, (char *) des_proto,
-            proto->addr->length)) {
+        
+        if (!bcmp(proto->addr->value, des_proto, proto->addr->length)) {
                 /* Not already updated? */
                 if (!trans) {
@@ -502 +502 @@
                         trans->hw_addr = NULL;
                         fibril_condvar_initialize(&trans->cv);
-                        rc = arp_addr_add(&proto->addresses, (char *) src_proto,
+                        rc = arp_addr_add(&proto->addresses, src_proto,
                             header->protocol_length, trans);
                         if (rc != EOK) {
@@ -510 +510 @@
                 }
                 if (!trans->hw_addr) {
-                        trans->hw_addr = measured_string_create_bulk(
-                            (char *) src_hw, header->hardware_length);
+                        trans->hw_addr = measured_string_create_bulk(src_hw,
+                            header->hardware_length);
                         if (!trans->hw_addr)
                                 return ENOMEM;
-
+                        
                         /* Notify the fibrils that wait for the translation. */
                         fibril_condvar_broadcast(&trans->cv);
@@ -681 +681 @@
         measured_string_t *address;
         measured_string_t *translation;
-        char *data;
+        uint8_t *data;
         packet_t *packet;
         packet_t *next;
@@ -748 +748 @@
         
         case NET_IL_RECEIVED:
+                
                 rc = packet_translate_remote(arp_globals.net_phone, &packet,
                     IPC_GET_PACKET(call));