Changeset 89ac5513 in mainline for uspace/lib/c/generic/iplink_srv.c

Timestamp:

2013-06-23T19:54:53Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ddb1922

Parents:

3abf0760 (diff), 96cbd18 (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/lib/c/generic/iplink_srv.c (modified) (5 diffs)

uspace/lib/c/generic/iplink_srv.c

@@ -54 +54 @@
     ipc_call_t *call)
 {
-        int rc;
-        iplink_srv_addr_t addr;
-
-        addr.ipv4 = IPC_GET_ARG1(*call);
-
-        rc = srv->ops->addr_add(srv, &addr);
+        int rc = srv->ops->addr_add(srv, IPC_GET_ARG1(*call));
         async_answer_0(callid, rc);
 }
@@ -66 +61 @@
     ipc_call_t *call)
 {
-        int rc;
-        iplink_srv_addr_t addr;
-
-        addr.ipv4 = IPC_GET_ARG1(*call);
-
-        rc = srv->ops->addr_remove(srv, &addr);
+        int rc = srv->ops->addr_remove(srv, IPC_GET_ARG1(*call));
         async_answer_0(callid, rc);
 }
@@ -81 +71 @@
         int rc;
 
-        sdu.lsrc.ipv4 = IPC_GET_ARG1(*call);
-        sdu.ldest.ipv4 = IPC_GET_ARG2(*call);
+        sdu.lsrc = IPC_GET_ARG1(*call);
+        sdu.ldest = IPC_GET_ARG2(*call);
 
         rc = async_data_write_accept(&sdu.data, false, 0, 0, 0, &sdu.size);
@@ -139 +129 @@
                 if (!method) {
                         /* The other side has hung up */
-                        fibril_mutex_lock(&srv->lock);
+                        fibril_mutex_lock(&srv->lock);
                         srv->connected = false;
-                        fibril_mutex_unlock(&srv->lock);
+                        fibril_mutex_unlock(&srv->lock);
                         async_answer_0(callid, EOK);
                         break;
@@ -175 +165 @@
 
         ipc_call_t answer;
-        aid_t req = async_send_2(exch, IPLINK_EV_RECV, sdu->lsrc.ipv4,
-            sdu->ldest.ipv4, &answer);
+        aid_t req = async_send_2(exch, IPLINK_EV_RECV, (sysarg_t) sdu->lsrc,
+            (sysarg_t) sdu->ldest, &answer);
         int rc = async_data_write_start(exch, sdu->data, sdu->size);
         async_exchange_end(exch);