Changeset c3887ad in mainline for uspace/lib/net/generic/generic.c

Timestamp:

2011-12-05T21:17:51Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

2f016df, 3f162ab, 78257fe

Parents:

1f5c9c96

Message:

Fix Ethernet. Missed change in generic_send_msg_remote() was causing arp module to see device address length as 0.

File:

• uspace/lib/net/generic/generic.c (modified) (1 diff)

uspace/lib/net/generic/generic.c

@@ -104 +104 @@
     nic_device_id_t device_id, uint8_t *address, size_t max_len)
 {
-        if (!address)
-                return EBADMEM;
+        aid_t aid;
+        ipc_call_t result;
+        
+        assert(address != NULL);
         
         /* Request the address */
         async_exch_t *exch = async_exchange_begin(sess);
-        aid_t aid = async_send_1(exch, message, (sysarg_t) device_id,
-            NULL);
+        aid = async_send_1(exch, message, (sysarg_t) device_id, &result);
+        
+        sysarg_t ipcrc;
         int rc = async_data_read_start(exch, address, max_len);
         async_exchange_end(exch);
         
-        sysarg_t result;
-        async_wait_for(aid, &result);
-        
-        if (rc != EOK)
+        if (rc != EOK) {
+                async_wait_for(aid, &ipcrc);
                 return rc;
-        
-        return (int) result;
+        }
+        
+        async_wait_for(aid, &ipcrc);
+        if (ipcrc == EOK) {
+                return IPC_GET_ARG1(result);
+        } else {
+                return (int) ipcrc;
+        }
 }