Changeset 609243f4 in mainline for uspace/lib/net/tl

Timestamp:

2011-10-07T15:46:01Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

e2c50e1

Parents:

f51b1d3

Message:

cherrypick general networking improvements from lp:~helenos-nicf/helenos/nicf (after sanitization)
remove obsolete networking drivers
this renders the networking non-functional for the time being

Location:

uspace/lib/net/tl

Files:

• icmp_client.c (modified) (3 diffs)
• tl_common.c (modified) (4 diffs)
• tl_remote.c (modified) (1 diff)

uspace/lib/net/tl/icmp_client.c

@@ -39 +39 @@
 #include <icmp_header.h>
 #include <packet_client.h>
-
-#ifdef CONFIG_DEBUG
-#include <stdio.h>
-#endif
-
 #include <errno.h>
 #include <sys/types.h>
-
 #include <net/icmp_codes.h>
 #include <net/packet.h>
@@ -60 +54 @@
  * @return              Zero if the packet contains no data.
  */
-int
-icmp_client_process_packet(packet_t *packet, icmp_type_t *type,
+int icmp_client_process_packet(packet_t *packet, icmp_type_t *type,
     icmp_code_t *code, icmp_param_t *pointer, icmp_param_t *mtu)
 {
@@ -81 +74 @@
                 *mtu = header->un.frag.mtu;
 
-        /* Remove debug dump */
-#ifdef CONFIG_DEBUG
-        printf("ICMP error %d (%d) in packet %d\n", header->type, header->code,
-            packet_get_id(packet));
-#endif
         return sizeof(icmp_header_t);
 }

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)
 {
@@ -160 +160 @@
 int
 tl_update_ip_packet_dimension(packet_dimensions_t *packet_dimensions,
-    device_id_t device_id, size_t content)
+    nic_device_id_t device_id, size_t content)
 {
         packet_dimension_t *packet_dimension;
@@ -170 +170 @@
         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 +179 @@
                         else
                                 packet_dimensions_exclude(packet_dimensions,
-                                    DEVICE_INVALID_ID, free);
+                                    NIC_DEVICE_INVALID_ID, free);
                 }
         }

uspace/lib/net/tl/tl_remote.c

@@ -56 +56 @@
  *
  */
-int tl_received_msg(async_sess_t *sess, device_id_t device_id, packet_t *packet,
+int tl_received_msg(async_sess_t *sess, nic_device_id_t device_id, packet_t *packet,
     services_t target, services_t error)
 {