Changeset d7ff048 in mainline for uspace/srv/net/tl/udp/udp.c

Timestamp:

2011-10-08T13:08:53Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

bf08ff0

Parents:

8367d1d (diff), 80099c19 (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/tl/udp/udp.c (modified) (5 diffs)

uspace/srv/net/tl/udp/udp.c

@@ -124 +124 @@
  *                      ip_client_process_packet() function.
  */
-static int udp_process_packet(device_id_t device_id, packet_t *packet,
+static int udp_process_packet(nic_device_id_t device_id, packet_t *packet,
     services_t error)
 {
@@ -322 +322 @@
  *                      udp_process_packet() function.
  */
-static int udp_received_msg(device_id_t device_id, packet_t *packet,
+static int udp_received_msg(nic_device_id_t device_id, packet_t *packet,
     services_t receiver, services_t error)
 {
@@ -499 +499 @@
         void *ip_header;
         size_t headerlen;
-        device_id_t device_id;
+        nic_device_id_t device_id;
         packet_dimension_t *packet_dimension;
         size_t size;
@@ -617 +617 @@
                     htons(flip_checksum(compact_checksum(checksum)));
                 free(ip_header);
-        } else {
-                device_id = DEVICE_INVALID_ID;
-        }
+        } else
+                device_id = NIC_DEVICE_INVALID_ID;
 
         /* Prepare the first packet fragment */
@@ -806 +805 @@
                         size = MAX_UDP_FRAGMENT_SIZE;
                         if (tl_get_ip_packet_dimension(udp_globals.ip_sess,
-                            &udp_globals.dimensions, DEVICE_INVALID_ID,
+                            &udp_globals.dimensions, NIC_DEVICE_INVALID_ID,
                             &packet_dimension) == EOK) {
                                 if (packet_dimension->content < size)