Changeset 32eceb4f in mainline for uspace/srv/net/il/ip/ip.h

Timestamp:

2010-11-20T22:30:36Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

cb59f787

Parents:

1b22bd4 (diff), 7e1f9b7 (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

@@ -59 +59 @@
 typedef struct ip_netif ip_netif_t;
 
-/** Type definition of the IP network interface specific data pointer.
- * @see ip_netif
- */
-typedef ip_netif_t *ip_netif_ref;
-
 /** Type definition of the IP protocol specific data.
  * @see ip_proto
@@ -69 +64 @@
 typedef struct ip_proto ip_proto_t;
 
-/** Type definition of the IP protocol specific data pointer.
- * @see ip_proto
- */
-typedef ip_proto_t *ip_proto_ref;
-
 /** Type definition of the IP route specific data.
  *  @see ip_route
  */
 typedef struct ip_route ip_route_t;
-
-/** Type definition of the IP route specific data pointer.
- *  @see ip_route
- */
-typedef ip_route_t *ip_route_ref;
 
 /** IP network interfaces.
@@ -104 +89 @@
 struct ip_netif {
         /** ARP module. Assigned if using ARP. */
-        module_ref arp;
+        module_t *arp;
         /** Broadcast address. */
         in_addr_t broadcast;
@@ -146 +131 @@
         in_addr_t gateway;
         /** Parent netif. */
-        ip_netif_ref netif;
+        ip_netif_t *netif;
         /** Target network mask. */
         in_addr_t netmask;