Changeset 80cd7cd in mainline for uspace/srv/net/il/arp/arp.h

Timestamp:

2011-01-13T20:58:24Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

87e373b

Parents:

eaef141 (diff), a613fea1 (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/arp/arp.h (modified) (4 diffs)

uspace/srv/net/il/arp/arp.h

@@ -96 +96 @@
         measured_string_t *addr;
         /** Actual device hardware address data. */
-        char *addr_data;
+        uint8_t *addr_data;
         /** Broadcast device hardware address. */
         measured_string_t *broadcast_addr;
         /** Broadcast device hardware address data. */
-        char *broadcast_data;
+        uint8_t *broadcast_data;
         /** Device identifier. */
         device_id_t device_id;
@@ -125 +125 @@
         arp_cache_t cache;
         
-        /**
-         * The client connection processing function.
-         * The module skeleton propagates its own one.
-         */
-        async_client_conn_t client_connection;
-        
         /** Networking module phone. */
         int net_phone;
@@ -142 +136 @@
         measured_string_t *addr;
         /** Actual device protocol address data. */
-        char *addr_data;
+        uint8_t *addr_data;
         /** Address map. */
         arp_addr_t addresses;
@@ -154 +148 @@
          * Hardware address for the translation. NULL denotes an incomplete
          * record with possible waiters.
-         */ 
+         */
         measured_string_t *hw_addr;
         /** Condition variable used for waiting for completion of the record. */