Changeset 0773396 in mainline for uspace/lib/c/generic/inetcfg.c

Timestamp:

2013-12-25T13:05:25Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

bc54126c

Parents:

f4a47e52 (diff), 6946f23 (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/inetcfg.c (modified) (3 diffs)

uspace/lib/c/generic/inetcfg.c

@@ -267 +267 @@
 }
 
+int inetcfg_link_add(sysarg_t link_id)
+{
+        async_exch_t *exch = async_exchange_begin(inetcfg_sess);
+
+        int rc = async_req_1_0(exch, INETCFG_LINK_ADD, link_id);
+        async_exchange_end(exch);
+
+        return rc;
+}
+
 int inetcfg_link_get(sysarg_t link_id, inet_link_info_t *linfo)
 {
@@ -279 +289 @@
         aid_t req = async_send_1(exch, INETCFG_LINK_GET, link_id, &answer);
         aid_t dreq = async_data_read(exch, name_buf, LOC_NAME_MAXLEN, &dreply);
+        int rc = async_data_read_start(exch, &linfo->mac_addr, sizeof(addr48_t));
         async_wait_for(dreq, &dretval);
 
         async_exchange_end(exch);
 
-        if (dretval != EOK) {
+        if (dretval != EOK || rc != EOK) {
                 async_forget(req);
                 return dretval;
@@ -302 +313 @@
 
         return EOK;
+}
+
+int inetcfg_link_remove(sysarg_t link_id)
+{
+        async_exch_t *exch = async_exchange_begin(inetcfg_sess);
+
+        int rc = async_req_1_0(exch, INETCFG_LINK_REMOVE, link_id);
+        async_exchange_end(exch);
+
+        return rc;
 }