Changes in uspace/lib/nic/include/nic_driver.h [9cd8165:00d7e1b] in mainline

File:

• uspace/lib/nic/include/nic_driver.h (modified) (5 diffs)

uspace/lib/nic/include/nic_driver.h

@@ -44 +44 @@
 
 #include <fibril_synch.h>
-#include <nic/nic.h>
+#include <net/device.h>
 #include <async.h>
 
@@ -50 +50 @@
 #include "nic_rx_control.h"
 #include "nic_wol_virtues.h"
+
+#define DEVICE_CATEGORY_NIC "nic"
 
 struct sw_poll_info {
@@ -70 +72 @@
          */
         ddf_fun_t *fun;
+        /** Identifier for higher network stack layers */
+        nic_device_id_t device_id;
         /** Current state of the device */
         nic_device_state_t state;
@@ -78 +82 @@
         /** Device's default MAC address (assigned the first time, used in STOP) */
         nic_address_t default_mac;
-        /** Client callback session */
-        async_sess_t *client_session;
+        /** Session to SERVICE_NETWORKING */
+        async_sess_t *net_session;
+        /** Session to SERVICE_ETHERNET or SERVICE_NILDUMMY */
+        async_sess_t *nil_session;
         /** Phone to APIC or i8259 */
         async_sess_t *irc_session;
@@ -128 +134 @@
          * Called with the main_lock locked for reading.
          */
-        send_frame_handler send_frame;
+        write_packet_handler write_packet;
         /**
          * Event handler called when device goes to the ACTIVE state.