Changeset cfb79747 in mainline for uspace/srv/net/net/net.h

Timestamp:

2012-02-14T22:06:15Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

a31aad1

Parents:

199112e4 (diff), e10d41a (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/srv/net/net/net.h (modified) (3 diffs)

uspace/srv/net/net/net.h

@@ -35 +35 @@
 #define NET_NET_H_
 
+#include <ipc/loc.h>
 #include <net/device.h>
 #include <adt/char_map.h>
@@ -41 +42 @@
 #include <adt/module_map.h>
 #include <net/packet.h>
-#include <devman.h>
 
 #define NAME  "net"
@@ -96 +96 @@
         
         /** Serving network interface driver module index. */
-        devman_handle_t handle;  /**< Handle for devman */
-        async_sess_t *sess;      /**< Driver session. */
+        service_id_t sid;    /**< Service ID */
+        async_sess_t *sess;  /**< Driver session. */
         
         module_t *nil;  /**< Serving link layer module index. */
         module_t *il;   /**< Serving internet layer module index. */
+        
+        link_t netif_list;
 } netif_t;