Changeset 98abd40 in mainline for uspace/srv/net/ethip/atrans.c

Timestamp:

2013-07-06T21:57:22Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

c8bb1633, cdc8a391

Parents:

b8e72fd1 (diff), 507c6f3 (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/ethip/atrans.c (modified) (7 diffs)

uspace/srv/net/ethip/atrans.c

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