Changeset a1347a7 in mainline for uspace/drv/nic/lo/lo.c

Timestamp:

2012-01-15T13:51:09Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

bd79281

Parents:

03e0a244 (diff), f302586 (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/drv/nic/lo/lo.c (modified) (2 diffs)

uspace/drv/nic/lo/lo.c

@@ -59 +59 @@
 };
 
-static void lo_write_packet(nic_t *nic_data, packet_t *packet)
+static void lo_send_frame(nic_t *nic_data, void *data, size_t size)
 {
-        nic_report_send_ok(nic_data, 1, packet_get_data_length(packet));
+        packet_t *packet;
+        int rc;
+
+        packet = nic_alloc_packet(nic_data, size);
+        if (packet == NULL)
+                return;
+
+        rc = packet_copy_data(packet, data, size);
+        if (rc != EOK)
+                return;
+
+        nic_report_send_ok(nic_data, 1, size);
         nic_received_noneth_packet(nic_data, packet);
 }
@@ -88 +99 @@
         
         dev->driver_data = nic_data;
-        nic_set_write_packet_handler(nic_data, lo_write_packet);
+        nic_set_send_frame_handler(nic_data, lo_send_frame);
         
         int rc = nic_connect_to_services(nic_data);