Index: uspace/srv/net/nil/nildummy/nildummy.c
===================================================================
--- uspace/srv/net/nil/nildummy/nildummy.c	(revision 08e3ca40338868956c14486807abfbfd6f4567e3)
+++ uspace/srv/net/nil/nildummy/nildummy.c	(revision fb04cba8d949f8b13de326b3aefd058316d54046)
@@ -150,6 +150,6 @@
  *			netif_get_addr_req() function.
  */
-static int
-nildummy_device_message(device_id_t device_id, services_t service, size_t mtu)
+static int nildummy_device_message(device_id_t device_id, services_t service,
+    size_t mtu)
 {
 	nildummy_device_ref device;
@@ -159,5 +159,5 @@
 	fibril_rwlock_write_lock(&nildummy_globals.devices_lock);
 
-	// an existing device?
+	/* An existing device? */
 	device = nildummy_devices_find(&nildummy_globals.devices, device_id);
 	if (device) {
@@ -169,5 +169,5 @@
 		}
 		
-		// update mtu
+		/* Update MTU */
 		if (mtu > 0)
 			device->mtu = mtu;
@@ -179,5 +179,5 @@
 		fibril_rwlock_write_unlock(&nildummy_globals.devices_lock);
 		
-		// notify the upper layer module
+		/* Notify the upper layer module */
 		fibril_rwlock_read_lock(&nildummy_globals.protos_lock);
 		if (nildummy_globals.proto.phone) {
@@ -191,5 +191,5 @@
 	}
 	
-	// create a new device
+	/* Create a new device */
 	device = (nildummy_device_ref) malloc(sizeof(nildummy_device_t));
 	if (!device)
@@ -203,5 +203,5 @@
 		device->mtu = NET_DEFAULT_MTU;
 
-	// bind the device driver
+	/* Bind the device driver */
 	device->phone = netif_bind_service(device->service, device->device_id,
 	    SERVICE_ETHERNET, nildummy_receiver);
@@ -212,5 +212,5 @@
 	}
 	
-	// get hardware address
+	/* Get hardware address */
 	rc = netif_get_addr_req(device->phone, device->device_id, &device->addr,
 	    &device->addr_data);
@@ -221,5 +221,5 @@
 	}
 	
-	// add to the cache
+	/* Add to the cache */
 	index = nildummy_devices_add(&nildummy_globals.devices,
 	    device->device_id, device);
@@ -247,6 +247,6 @@
  *
  */
-static int
-nildummy_addr_message(device_id_t device_id, measured_string_ref *address)
+static int nildummy_addr_message(device_id_t device_id,
+    measured_string_ref *address)
 {
 	nildummy_device_ref device;
@@ -279,6 +279,5 @@
  *
  */
-static int
-nildummy_packet_space_message(device_id_t device_id, size_t *addr_len,
+static int nildummy_packet_space_message(device_id_t device_id, size_t *addr_len,
     size_t *prefix, size_t *content, size_t *suffix)
 {
@@ -294,4 +293,5 @@
 		return ENOENT;
 	}
+
 	*content = device->mtu;
 	fibril_rwlock_read_unlock(&nildummy_globals.devices_lock);
@@ -303,7 +303,6 @@
 }
 
-int
-nil_received_msg_local(int nil_phone, device_id_t device_id, packet_t packet,
-    services_t target)
+int nil_received_msg_local(int nil_phone, device_id_t device_id,
+    packet_t packet, services_t target)
 {
 	packet_t next;
@@ -355,6 +354,6 @@
  * @return		EINVAL if the service parameter is not known.
  */
-static int
-nildummy_send_message(device_id_t device_id, packet_t packet, services_t sender)
+static int nildummy_send_message(device_id_t device_id, packet_t packet,
+    services_t sender)
 {
 	nildummy_device_ref device;
@@ -366,5 +365,6 @@
 		return ENOENT;
 	}
-	// send packet queue
+
+	/* Send packet queue */
 	if (packet)
 		netif_send_msg(device->phone, device_id, packet,
@@ -374,7 +374,6 @@
 }
 
-int
-nil_message_standalone(const char *name, ipc_callid_t callid, ipc_call_t *call,
-    ipc_call_t *answer, int *answer_count)
+int nil_message_standalone(const char *name, ipc_callid_t callid,
+    ipc_call_t *call, ipc_call_t *answer, int *answer_count)
 {
 	measured_string_ref address;
Index: uspace/srv/net/nil/nildummy/nildummy_module.c
===================================================================
--- uspace/srv/net/nil/nildummy/nildummy_module.c	(revision 08e3ca40338868956c14486807abfbfd6f4567e3)
+++ uspace/srv/net/nil/nildummy/nildummy_module.c	(revision fb04cba8d949f8b13de326b3aefd058316d54046)
@@ -78,6 +78,5 @@
 }
 
-int
-nil_module_message_standalone(const char *name, ipc_callid_t callid,
+int nil_module_message_standalone(const char *name, ipc_callid_t callid,
     ipc_call_t *call, ipc_call_t *answer, int *answer_count)
 {