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

Timestamp:

2010-10-13T22:48:25Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ef689ef0

Parents:

b278b4e (diff), 753bca3 (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 lp:~jakub/helenos/net.

File:

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

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

@@ -227 +227 @@
         printf("Device %d cleared\n", device_id);
         fibril_rwlock_write_unlock(&arp_globals.lock);
-        return EOK;
-}
-
-int arp_connect_module(services_t service){
-        if(service != SERVICE_ARP){
-                return EINVAL;
-        }
         return EOK;
 }
@@ -603 +596 @@
         nil_send_msg(device->phone, device_id, packet, SERVICE_ARP);
         return NULL;
-}
-
-int arp_translate_req(int arp_phone, device_id_t device_id, services_t protocol, measured_string_ref address, measured_string_ref * translation, char ** data){
-        measured_string_ref tmp;
-
-        fibril_rwlock_read_lock(&arp_globals.lock);
-        tmp = arp_translate_message(device_id, protocol, address);
-        if(tmp){
-                *translation = measured_string_copy(tmp);
-                fibril_rwlock_read_unlock(&arp_globals.lock);
-                if(*translation){
-                        *data = (** translation).value;
-                        return EOK;
-                }else{
-                        return ENOMEM;
-                }
-        }else{
-                fibril_rwlock_read_unlock(&arp_globals.lock);
-                return ENOENT;
-        }
 }