Changeset 86c71de in mainline for uspace/srv/net/nil/eth/eth.c

Timestamp:

2012-01-21T12:57:55Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

eaa0c3f

Parents:

47a89fe (diff), e86b8f0 (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 with mainline

File:

• uspace/srv/net/nil/eth/eth.c (modified) (2 diffs)

uspace/srv/net/nil/eth/eth.c

@@ -814 +814 @@
 }
 
+static int eth_received(nic_device_id_t device_id)
+{
+        void *data;
+        size_t size;
+        int rc;
+        
+        rc = async_data_write_accept(&data, false, 0, 0, 0, &size);
+        if (rc != EOK)
+                return rc;
+        
+        packet_t *packet = packet_get_1_remote(eth_globals.net_sess, size);
+        if (packet == NULL)
+                return ENOMEM;
+        
+        void *pdata = packet_suffix(packet, size);
+        memcpy(pdata, data, size);
+        free(data);
+        
+        return nil_received_msg_local(device_id, packet);
+}
+
 static int eth_addr_changed(nic_device_id_t device_id)
 {
@@ -926 +947 @@
                 return EOK;
         case NET_NIL_RECEIVED:
-                rc = packet_translate_remote(eth_globals.net_sess, &packet,
-                    IPC_GET_ARG2(*call));
-                if (rc == EOK)
-                        rc = nil_received_msg_local(IPC_GET_ARG1(*call), packet);
-                
+                rc = eth_received(IPC_GET_ARG1(*call));
                 async_answer_0(callid, (sysarg_t) rc);
                 return rc;