Changeset 6a44ee4 in mainline for uspace/srv/net/il/ip/ip.h

Timestamp:

2011-07-20T15:26:21Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

efcebe1

Parents:

25bef0ff (diff), a701812 (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/il/ip/ip.h (modified) (4 diffs)

uspace/srv/net/il/ip/ip.h

@@ -38 +38 @@
 #define NET_IP_H_
 
+#include <async.h>
 #include <fibril_synch.h>
 #include <ipc/services.h>
@@ -98 +99 @@
         /** Packet dimension. */
         packet_dimension_t packet_dimension;
-        /** Netif module phone. */
-        int phone;
+        /** Netif module session. */
+        async_sess_t *sess;
         /** Routing table. */
         ip_routes_t routes;
@@ -112 +113 @@
 /** IP protocol specific data. */
 struct ip_proto {
-        /** Protocol module phone. */
-        int phone;
+        /** Protocol module session. */
+        async_sess_t *sess;
         /** Protocol number. */
         int protocol;
@@ -142 +143 @@
         /** Known support modules. */
         modules_t modules;
-        /** Networking module phone. */
-        int net_phone;
+        /** Networking module session. */
+        async_sess_t *net_sess;
         /** Registered network interfaces. */
         ip_netifs_t netifs;