Changes in uspace/lib/net/generic/generic.c [c3887ad:00d7e1b] in mainline

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)
 {
-        aid_t aid;
-        ipc_call_t result;
-        
-        assert(address != NULL);
+        if (!address)
+                return EBADMEM;
         
         /* Request the address */
         async_exch_t *exch = async_exchange_begin(sess);
-        aid = async_send_1(exch, message, (sysarg_t) device_id, &result);
-        
-        sysarg_t ipcrc;
+        aid_t aid = async_send_1(exch, message, (sysarg_t) device_id,
+            NULL);
         int rc = async_data_read_start(exch, address, max_len);
         async_exchange_end(exch);
         
-        if (rc != EOK) {
-                async_wait_for(aid, &ipcrc);
+        sysarg_t result;
+        async_wait_for(aid, &result);
+        
+        if (rc != EOK)
                 return rc;
-        }
-        
-        async_wait_for(aid, &ipcrc);
-        if (ipcrc == EOK) {
-                return IPC_GET_ARG1(result);
-        } else {
-                return (int) ipcrc;
-        }
+        
+        return (int) result;
 }