Changeset cb569e6 in mainline for uspace/srv/net/il/arp/arp.c

Timestamp:

2010-11-18T21:58:27Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

4e5c7ba

Parents:

69e0d6d (diff), 45f04f8 (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.c (modified) (14 diffs)

uspace/srv/net/il/arp/arp.c

@@ -125 +125 @@
 }
 
-static int
-arp_clear_address_req(int arp_phone, device_id_t device_id, services_t protocol,
-    measured_string_ref address)
+static int arp_clear_address_req(int arp_phone, device_id_t device_id,
+    services_t protocol, measured_string_ref address)
 {
         arp_device_ref device;
@@ -175 +174 @@
  * @returns             ENOMEM if there is not enough memory left.
  */
-static int
-arp_proto_create(arp_proto_ref *proto, services_t service,
+static int arp_proto_create(arp_proto_ref *proto, services_t service,
     measured_string_ref address)
 {
@@ -214 +212 @@
  *                      measured_strings_return() function.
  */
-static int
-arp_device_message(device_id_t device_id, services_t service,
+static int arp_device_message(device_id_t device_id, services_t service,
     services_t protocol, measured_string_ref address)
 {
@@ -225 +222 @@
 
         fibril_rwlock_write_lock(&arp_globals.lock);
-        // an existing device?
+
+        /* An existing device? */
         device = arp_cache_find(&arp_globals.cache, device_id);
+
         if (device) {
                 if (device->service != service) {
@@ -260 +259 @@
                         return ENOENT;
                 
-                // create a new device
+                /* Create a new device */
                 device = (arp_device_ref) malloc(sizeof(arp_device_t));
                 if (!device) {
@@ -289 +288 @@
                 device->service = service;
                 
-                // bind the new one
+                /* Bind the new one */
                 device->phone = nil_bind_service(device->service,
                     (ipcarg_t) device->device_id, SERVICE_ARP,
@@ -300 +299 @@
                 }
                 
-                // get packet dimensions
+                /* Get packet dimensions */
                 rc = nil_packet_size_req(device->phone, device_id,
                     &device->packet_dimension);
@@ -310 +309 @@
                 }
                 
-                // get hardware address
+                /* Get hardware address */
                 rc = nil_get_addr_req(device->phone, device_id, &device->addr,
                     &device->addr_data);
@@ -320 +319 @@
                 }
                 
-                // get broadcast address
+                /* Get broadcast address */
                 rc = nil_get_broadcast_addr_req(device->phone, device_id,
                     &device->broadcast_addr, &device->broadcast_data);
@@ -455 +454 @@
         hw_source = arp_addr_find(&proto->addresses, (char *) src_proto,
             CONVERT_SIZE(uint8_t, char, header->protocol_length));
-        // exists?
+        /* Exists? */
         if (hw_source) {
                 if (hw_source->length != CONVERT_SIZE(uint8_t, char,
@@ -463 +462 @@
                 memcpy(hw_source->value, src_hw, hw_source->length);
         }
-        // is my protocol address?
+        /* Is my protocol address? */
         if (proto->addr->length != CONVERT_SIZE(uint8_t, char,
             header->protocol_length)) {
@@ -470 +469 @@
         if (!str_lcmp(proto->addr->value, (char *) des_proto,
             proto->addr->length)) {
-                // not already upadted?
+                /* Not already updated? */
                 if (!hw_source) {
                         hw_source = measured_string_create_bulk((char *) src_hw,
@@ -550 +549 @@
                 return addr;
 
-        // ARP packet content size = header + (address + translation) * 2
+        /* ARP packet content size = header + (address + translation) * 2 */
         length = 8 + 2 * (CONVERT_SIZE(char, uint8_t, proto->addr->length) +
             CONVERT_SIZE(char, uint8_t, device->addr->length));
@@ -674 +673 @@
         
         case NET_IL_DEVICE_STATE:
-                // do nothing - keep the cache
+                /* Do nothing - keep the cache */
                 return EOK;