Changeset 7943c43 in mainline for uspace/lib/drv/include/ops/nic.h

Timestamp:

2012-01-16T22:45:38Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

32817cc, 3fe58d3c

Parents:

9117ef9b (diff), 3ea725e (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/drv/include/ops/nic.h (modified) (2 diffs)

uspace/lib/drv/include/ops/nic.h

@@ -37 +37 @@
 #define LIBDRV_OPS_NIC_H_
 
-#include <net/packet.h>
 #include <ipc/services.h>
 #include <net/device.h>
@@ -46 +45 @@
 typedef struct nic_iface {
         /** Mandatory methods */
-        int (*send_message)(ddf_fun_t *, packet_id_t);
+        int (*send_frame)(ddf_fun_t *, void *, size_t);
         int (*connect_to_nil)(ddf_fun_t *, services_t, nic_device_id_t);
         int (*get_state)(ddf_fun_t *, nic_device_state_t *);