Changeset 00aece0 in mainline for uspace/lib/net/tl/tl_common.c

Timestamp:

2012-02-18T16:47:38Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4449c6c

Parents:

bd5f3b7 (diff), f943dd3 (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/lib/net/tl/tl_common.c (modified) (4 diffs)

uspace/lib/net/tl/tl_common.c

@@ -119 +119 @@
  */
 int tl_get_ip_packet_dimension(async_sess_t *sess,
-    packet_dimensions_t *packet_dimensions, device_id_t device_id,
+    packet_dimensions_t *packet_dimensions, nic_device_id_t device_id,
     packet_dimension_t **packet_dimension)
 {
@@ -158 +158 @@
  * @return              ENOENT if the packet dimension is not cached.
  */
-int
-tl_update_ip_packet_dimension(packet_dimensions_t *packet_dimensions,
-    device_id_t device_id, size_t content)
+int tl_update_ip_packet_dimension(packet_dimensions_t *packet_dimensions,
+    nic_device_id_t device_id, size_t content)
 {
         packet_dimension_t *packet_dimension;
@@ -170 +169 @@
         packet_dimension->content = content;
 
-        if (device_id != DEVICE_INVALID_ID) {
+        if (device_id != NIC_DEVICE_INVALID_ID) {
                 packet_dimension = packet_dimensions_find(packet_dimensions,
-                    DEVICE_INVALID_ID);
+                    NIC_DEVICE_INVALID_ID);
 
                 if (packet_dimension) {
@@ -179 +178 @@
                         else
                                 packet_dimensions_exclude(packet_dimensions,
-                                    DEVICE_INVALID_ID, free);
+                                    NIC_DEVICE_INVALID_ID, free);
                 }
         }