Changes in uspace/srv/net/ethip/atrans.c [feeac0d:69a93df7] in mainline

File:

• uspace/srv/net/ethip/atrans.c (modified) (6 diffs)

uspace/srv/net/ethip/atrans.c

@@ -49 +49 @@
 static FIBRIL_CONDVAR_INITIALIZE(atrans_cv);
 
-static ethip_atrans_t *atrans_find(addr32_t ip_addr)
+static ethip_atrans_t *atrans_find(iplink_srv_addr_t *ip_addr)
 {
-        list_foreach(atrans_list, atrans_list, ethip_atrans_t, atrans) {
-                if (atrans->ip_addr == ip_addr)
+        list_foreach(atrans_list, link) {
+                ethip_atrans_t *atrans = list_get_instance(link,
+                    ethip_atrans_t, atrans_list);
+
+                if (atrans->ip_addr.ipv4 == ip_addr->ipv4)
                         return atrans;
         }
@@ -59 +62 @@
 }
 
-int atrans_add(addr32_t ip_addr, addr48_t mac_addr)
+int atrans_add(iplink_srv_addr_t *ip_addr, mac48_addr_t *mac_addr)
 {
         ethip_atrans_t *atrans;
@@ -68 +71 @@
                 return ENOMEM;
 
-        atrans->ip_addr = ip_addr;
-        addr48(mac_addr, atrans->mac_addr);
+        atrans->ip_addr = *ip_addr;
+        atrans->mac_addr = *mac_addr;
 
         fibril_mutex_lock(&atrans_list_lock);
@@ -85 +88 @@
 }
 
-int atrans_remove(addr32_t ip_addr)
+int atrans_remove(iplink_srv_addr_t *ip_addr)
 {
         ethip_atrans_t *atrans;
@@ -103 +106 @@
 }
 
-int atrans_lookup(addr32_t ip_addr, addr48_t mac_addr)
+int atrans_lookup(iplink_srv_addr_t *ip_addr, mac48_addr_t *mac_addr)
 {
+        ethip_atrans_t *atrans;
+
         fibril_mutex_lock(&atrans_list_lock);
-        ethip_atrans_t *atrans = atrans_find(ip_addr);
+        atrans = atrans_find(ip_addr);
         if (atrans == NULL) {
                 fibril_mutex_unlock(&atrans_list_lock);
                 return ENOENT;
         }
-        
+
         fibril_mutex_unlock(&atrans_list_lock);
-        addr48(atrans->mac_addr, mac_addr);
+        *mac_addr = atrans->mac_addr;
         return EOK;
 }
@@ -119 +124 @@
 int atrans_wait_timeout(suseconds_t timeout)
 {
+        int rc;
+
         fibril_mutex_lock(&atrans_list_lock);
-        int rc = fibril_condvar_wait_timeout(&atrans_cv, &atrans_list_lock,
+        rc = fibril_condvar_wait_timeout(&atrans_cv, &atrans_list_lock,
             timeout);
         fibril_mutex_unlock(&atrans_list_lock);
-        
+
         return rc;
 }