Changeset c38e417 in mainline for uspace/lib/nic/include/nic_driver.h

Timestamp:

2012-01-22T11:53:22Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

b7e0260

Parents:

eaa0c3f (diff), 8d7ec69d (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/lib/nic/include/nic_driver.h (modified) (1 diff)

uspace/lib/nic/include/nic_driver.h

@@ -80 +80 @@
         /** Device's default MAC address (assigned the first time, used in STOP) */
         nic_address_t default_mac;
-        /** Session to SERVICE_ETHERNET or SERVICE_NILDUMMY */
-        async_sess_t *nil_session;
+        /** Client callback session */
+        async_sess_t *client_session;
         /** Phone to APIC or i8259 */
         async_sess_t *irc_session;