Index: uspace/srv/net/nil/eth/eth.c
===================================================================
--- uspace/srv/net/nil/eth/eth.c	(revision 30b2d0246adda2ba3bca8b47747fe929352297df)
+++ uspace/srv/net/nil/eth/eth.c	(revision 6067284b6f44b70fbfd9b716f22ee20692b884f6)
@@ -66,256 +66,233 @@
 #include "eth_header.h"
 
-/** The module name.
- */
+/** The module name. */
 #define NAME  "eth"
 
-/** Reserved packet prefix length.
- */
-#define ETH_PREFIX		(sizeof(eth_header_t) + sizeof(eth_header_lsap_t) + sizeof(eth_header_snap_t))
-
-/** Reserved packet suffix length.
- */
-#define ETH_SUFFIX		sizeof(eth_fcs_t)
-
-/** Maximum packet content length.
- */
+/** Reserved packet prefix length. */
+#define ETH_PREFIX \
+	(sizeof(eth_header_t) + sizeof(eth_header_lsap_t) + \
+	sizeof(eth_header_snap_t))
+
+/** Reserved packet suffix length. */
+#define ETH_SUFFIX \
+	sizeof(eth_fcs_t)
+
+/** Maximum packet content length. */
 #define ETH_MAX_CONTENT 1500u
 
-/** Minimum packet content length.
- */
+/** Minimum packet content length. */
 #define ETH_MIN_CONTENT 46u
 
-/** Maximum tagged packet content length.
- */
-#define ETH_MAX_TAGGED_CONTENT(flags)	(ETH_MAX_CONTENT - ((IS_8023_2_LSAP(flags) || IS_8023_2_SNAP(flags)) ? sizeof(eth_header_lsap_t) : 0) - (IS_8023_2_SNAP(flags) ? sizeof(eth_header_snap_t) : 0))
-
-/** Minimum tagged packet content length.
- */
-#define ETH_MIN_TAGGED_CONTENT(flags)	(ETH_MIN_CONTENT - ((IS_8023_2_LSAP(flags) || IS_8023_2_SNAP(flags)) ? sizeof(eth_header_lsap_t) : 0) - (IS_8023_2_SNAP(flags) ? sizeof(eth_header_snap_t) : 0))
-
-/** Dummy flag shift value.
- */
+/** Maximum tagged packet content length. */
+#define ETH_MAX_TAGGED_CONTENT(flags) \
+	(ETH_MAX_CONTENT - \
+	((IS_8023_2_LSAP(flags) || IS_8023_2_SNAP(flags)) ? \
+	sizeof(eth_header_lsap_t) : 0) - \
+	(IS_8023_2_SNAP(flags) ? sizeof(eth_header_snap_t) : 0))
+
+/** Minimum tagged packet content length. */
+#define ETH_MIN_TAGGED_CONTENT(flags) \
+	(ETH_MIN_CONTENT - \
+	((IS_8023_2_LSAP(flags) || IS_8023_2_SNAP(flags)) ? \
+	sizeof(eth_header_lsap_t) : 0) - \
+	(IS_8023_2_SNAP(flags) ? sizeof(eth_header_snap_t) : 0))
+
+/** Dummy flag shift value. */
 #define ETH_DUMMY_SHIFT	0
 
-/** Mode flag shift value.
- */
+/** Mode flag shift value. */
 #define ETH_MODE_SHIFT	1
 
 /** Dummy device flag.
- *  Preamble and FCS are mandatory part of the packets.
- */
-#define ETH_DUMMY				(1 << ETH_DUMMY_SHIFT)
+ * Preamble and FCS are mandatory part of the packets.
+ */
+#define ETH_DUMMY		(1 << ETH_DUMMY_SHIFT)
 
 /** Returns the dummy flag.
- *  @see ETH_DUMMY
- */
-#define IS_DUMMY(flags)		((flags) &ETH_DUMMY)
+ * @see ETH_DUMMY
+ */
+#define IS_DUMMY(flags)		((flags) & ETH_DUMMY)
 
 /** Device mode flags.
- *  @see ETH_DIX
- *  @see ETH_8023_2_LSAP
- *  @see ETH_8023_2_SNAP
- */
-#define ETH_MODE_MASK			(3 << ETH_MODE_SHIFT)
-
-/** DIX Ethernet mode flag.
- */
-#define ETH_DIX					(1 << ETH_MODE_SHIFT)
+ * @see ETH_DIX
+ * @see ETH_8023_2_LSAP
+ * @see ETH_8023_2_SNAP
+ */
+#define ETH_MODE_MASK		(3 << ETH_MODE_SHIFT)
+
+/** DIX Ethernet mode flag. */
+#define ETH_DIX			(1 << ETH_MODE_SHIFT)
 
 /** Returns whether the DIX Ethernet mode flag is set.
- *  @param[in] flags The ethernet flags.
- *  @see ETH_DIX
- */
-#define IS_DIX(flags)			(((flags) &ETH_MODE_MASK) == ETH_DIX)
-
-/** 802.3 + 802.2 + LSAP mode flag.
- */
-#define ETH_8023_2_LSAP			(2 << ETH_MODE_SHIFT)
+ *
+ * @param[in] flags	The ethernet flags.
+ * @see ETH_DIX
+ */
+#define IS_DIX(flags)		(((flags) & ETH_MODE_MASK) == ETH_DIX)
+
+/** 802.3 + 802.2 + LSAP mode flag. */
+#define ETH_8023_2_LSAP		(2 << ETH_MODE_SHIFT)
 
 /** Returns whether the 802.3 + 802.2 + LSAP mode flag is set.
- *  @param[in] flags The ethernet flags.
- *  @see ETH_8023_2_LSAP
- */
-#define IS_8023_2_LSAP(flags)	(((flags) &ETH_MODE_MASK) == ETH_8023_2_LSAP)
-
-/** 802.3 + 802.2 + LSAP + SNAP mode flag.
- */
-#define ETH_8023_2_SNAP			(3 << ETH_MODE_SHIFT)
+ *
+ * @param[in] flags	The ethernet flags.
+ * @see ETH_8023_2_LSAP
+ */
+#define IS_8023_2_LSAP(flags)	(((flags) & ETH_MODE_MASK) == ETH_8023_2_LSAP)
+
+/** 802.3 + 802.2 + LSAP + SNAP mode flag. */
+#define ETH_8023_2_SNAP		(3 << ETH_MODE_SHIFT)
 
 /** Returns whether the 802.3 + 802.2 + LSAP + SNAP mode flag is set.
- *  @param[in] flags The ethernet flags.
- *  @see ETH_8023_2_SNAP
- */
-#define IS_8023_2_SNAP(flags)	(((flags) &ETH_MODE_MASK) == ETH_8023_2_SNAP)
+ *
+ * @param[in] flags	The ethernet flags.
+ * @see ETH_8023_2_SNAP
+ */
+#define IS_8023_2_SNAP(flags)	(((flags) & ETH_MODE_MASK) == ETH_8023_2_SNAP)
 
 /** Type definition of the ethernet address type.
- *  @see eth_addr_type
- */
-typedef enum eth_addr_type	eth_addr_type_t;
+ * @see eth_addr_type
+ */
+typedef enum eth_addr_type eth_addr_type_t;
 
 /** Type definition of the ethernet address type pointer.
- *  @see eth_addr_type
- */
-typedef eth_addr_type_t *	eth_addr_type_ref;
-
-/** Ethernet address type.
- */
-enum eth_addr_type{
-	/** Local address.
-	 */
+ * @see eth_addr_type
+ */
+typedef eth_addr_type_t *eth_addr_type_ref;
+
+/** Ethernet address type. */
+enum eth_addr_type {
+	/** Local address. */
 	ETH_LOCAL_ADDR,
-	/** Broadcast address.
-	 */
+	/** Broadcast address. */
 	ETH_BROADCAST_ADDR
 };
 
-/** Ethernet module global data.
- */
-eth_globals_t	eth_globals;
-
-/** @name Message processing functions
- */
-/*@{*/
-
-/** Processes IPC messages from the registered device driver modules in an infinite loop.
- *  @param[in] iid The message identifier.
- *  @param[in,out] icall The message parameters.
- */
-void eth_receiver(ipc_callid_t iid, ipc_call_t * icall);
-
-/** Registers new device or updates the MTU of an existing one.
- *  Determines the device local hardware address.
- *  @param[in] device_id The new device identifier.
- *  @param[in] service The device driver service.
- *  @param[in] mtu The device maximum transmission unit.
- *  @returns EOK on success.
- *  @returns EEXIST if the device with the different service exists.
- *  @returns ENOMEM if there is not enough memory left.
- *  @returns Other error codes as defined for the net_get_device_conf_req() function.
- *  @returns Other error codes as defined for the netif_bind_service() function.
- *  @returns Other error codes as defined for the netif_get_addr_req() function.
- */
-int eth_device_message(device_id_t device_id, services_t service, size_t mtu);
-
-/** Registers receiving module service.
- *  Passes received packets for this service.
- *  @param[in] service The module service.
- *  @param[in] phone The service phone.
- *  @returns EOK on success.
- *  @returns ENOENT if the service is not known.
- *  @returns ENOMEM if there is not enough memory left.
- */
-int eth_register_message(services_t service, int phone);
-
-/** Returns the device packet dimensions for sending.
- *  @param[in] device_id The device identifier.
- *  @param[out] addr_len The minimum reserved address length.
- *  @param[out] prefix The minimum reserved prefix size.
- *  @param[out] content The maximum content size.
- *  @param[out] suffix The minimum reserved suffix size.
- *  @returns EOK on success.
- *  @returns EBADMEM if either one of the parameters is NULL.
- *  @returns ENOENT if there is no such device.
- */
-int eth_packet_space_message(device_id_t device_id, size_t * addr_len, size_t * prefix, size_t * content, size_t * suffix);
-
-/** Returns the device hardware address.
- *  @param[in] device_id The device identifier.
- *  @param[in] type Type of the desired address.
- *  @param[out] address The device hardware address.
- *  @returns EOK on success.
- *  @returns EBADMEM if the address parameter is NULL.
- *  @returns ENOENT if there no such device.
- */
-int eth_addr_message(device_id_t device_id, eth_addr_type_t type, measured_string_ref * address);
-
-/** Sends the packet queue.
- *  Sends only packet successfully processed by the eth_prepare_packet() function.
- *  @param[in] device_id The device identifier.
- *  @param[in] packet The packet queue.
- *  @param[in] sender The sending module service.
- *  @returns EOK on success.
- *  @returns ENOENT if there no such device.
- *  @returns EINVAL if the service parameter is not known.
- */
-int eth_send_message(device_id_t device_id, packet_t packet, services_t sender);
-
-/*@}*/
-
-/** Processes the received packet and chooses the target registered module.
- *  @param[in] flags The device flags.
- *  @param[in] packet The packet.
- *  @returns The target registered module.
- *  @returns NULL if the packet is not long enough.
- *  @returns NULL if the packet is too long.
- *  @returns NULL if the raw ethernet protocol is used.
- *  @returns NULL if the dummy device FCS checksum is invalid.
- *  @returns NULL if the packet address length is not big enough.
- */
-eth_proto_ref eth_process_packet(int flags, packet_t packet);
-
-/** Prepares the packet for sending.
- *  @param[in] flags The device flags.
- *  @param[in] packet The packet.
- *  @param[in] src_addr The source hardware address.
- *  @param[in] ethertype The ethernet protocol type.
- *  @param[in] mtu The device maximum transmission unit.
- *  @returns EOK on success.
- *  @returns EINVAL if the packet addresses length is not long enough.
- *  @returns EINVAL if the packet is bigger than the device MTU.
- *  @returns ENOMEM if there is not enough memory in the packet.
- */
-int eth_prepare_packet(int flags, packet_t packet, uint8_t * src_addr, int ethertype, size_t mtu);
-
-DEVICE_MAP_IMPLEMENT(eth_devices, eth_device_t)
-
-INT_MAP_IMPLEMENT(eth_protos, eth_proto_t)
-
-int nil_device_state_msg_local(int nil_phone, device_id_t device_id, int state){
+/** Ethernet module global data. */
+eth_globals_t eth_globals;
+
+DEVICE_MAP_IMPLEMENT(eth_devices, eth_device_t);
+INT_MAP_IMPLEMENT(eth_protos, eth_proto_t);
+
+int nil_device_state_msg_local(int nil_phone, device_id_t device_id, int state)
+{
 	int index;
 	eth_proto_ref proto;
 
 	fibril_rwlock_read_lock(&eth_globals.protos_lock);
-	for(index = eth_protos_count(&eth_globals.protos) - 1; index >= 0; -- index){
+	for (index = eth_protos_count(&eth_globals.protos) - 1; index >= 0;
+	    index--) {
 		proto = eth_protos_get_index(&eth_globals.protos, index);
-		if(proto && proto->phone){
-			il_device_state_msg(proto->phone, device_id, state, proto->service);
+		if (proto && proto->phone) {
+			il_device_state_msg(proto->phone, device_id, state,
+			    proto->service);
 		}
 	}
 	fibril_rwlock_read_unlock(&eth_globals.protos_lock);
+	
 	return EOK;
 }
 
-int nil_initialize(int net_phone){
+int nil_initialize(int net_phone)
+{
 	ERROR_DECLARE;
 
 	fibril_rwlock_initialize(&eth_globals.devices_lock);
 	fibril_rwlock_initialize(&eth_globals.protos_lock);
+	
 	fibril_rwlock_write_lock(&eth_globals.devices_lock);
 	fibril_rwlock_write_lock(&eth_globals.protos_lock);
 	eth_globals.net_phone = net_phone;
-	eth_globals.broadcast_addr = measured_string_create_bulk("\xFF\xFF\xFF\xFF\xFF\xFF", CONVERT_SIZE(uint8_t, char, ETH_ADDR));
-	if(! eth_globals.broadcast_addr){
-		return ENOMEM;
-	}
-	ERROR_PROPAGATE(eth_devices_initialize(&eth_globals.devices));
-	if(ERROR_OCCURRED(eth_protos_initialize(&eth_globals.protos))){
+	eth_globals.broadcast_addr =
+	    measured_string_create_bulk("\xFF\xFF\xFF\xFF\xFF\xFF",
+	    CONVERT_SIZE(uint8_t, char, ETH_ADDR));
+	if (!eth_globals.broadcast_addr) {
+		ERROR_CODE = ENOMEM;
+		goto out;
+	}
+	if (ERROR_OCCURRED(eth_devices_initialize(&eth_globals.devices)))
+		goto out;
+	if (ERROR_OCCURRED(eth_protos_initialize(&eth_globals.protos)))
 		eth_devices_destroy(&eth_globals.devices);
-		return ERROR_CODE;
-	}
+out:
 	fibril_rwlock_write_unlock(&eth_globals.protos_lock);
 	fibril_rwlock_write_unlock(&eth_globals.devices_lock);
-	return EOK;
-}
-
-int eth_device_message(device_id_t device_id, services_t service, size_t mtu){
+	
+	return ERROR_CODE;
+}
+
+/** Processes IPC messages from the registered device driver modules in an
+ * infinite loop.
+ *
+ * @param[in] iid	The message identifier.
+ * @param[in,out] icall	The message parameters.
+ */
+static void eth_receiver(ipc_callid_t iid, ipc_call_t *icall)
+{
+	ERROR_DECLARE;
+
+	packet_t packet;
+
+	while (true) {
+		switch (IPC_GET_METHOD(*icall)) {
+		case NET_NIL_DEVICE_STATE:
+			nil_device_state_msg_local(0, IPC_GET_DEVICE(icall),
+			    IPC_GET_STATE(icall));
+			ipc_answer_0(iid, EOK);
+			break;
+		case NET_NIL_RECEIVED:
+			if (ERROR_NONE(packet_translate_remote(
+			    eth_globals.net_phone, &packet,
+			    IPC_GET_PACKET(icall)))) {
+				ERROR_CODE = nil_received_msg_local(0,
+				    IPC_GET_DEVICE(icall), packet, 0);
+			}
+			ipc_answer_0(iid, (ipcarg_t) ERROR_CODE);
+			break;
+		default:
+			ipc_answer_0(iid, (ipcarg_t) ENOTSUP);
+		}
+		
+		iid = async_get_call(icall);
+	}
+}
+
+/** Registers new device or updates the MTU of an existing one.
+ *
+ * Determines the device local hardware address.
+ *
+ * @param[in] device_id	The new device identifier.
+ * @param[in] service	The device driver service.
+ * @param[in] mtu	The device maximum transmission unit.
+ * @returns		EOK on success.
+ * @returns		EEXIST if the device with the different service exists.
+ * @returns		ENOMEM if there is not enough memory left.
+ * @returns		Other error codes as defined for the
+ *			net_get_device_conf_req() function.
+ * @returns		Other error codes as defined for the
+ *			netif_bind_service() function.
+ * @returns		Other error codes as defined for the
+ *			netif_get_addr_req() function.
+ */
+static int
+eth_device_message(device_id_t device_id, services_t service, size_t mtu)
+{
 	ERROR_DECLARE;
 
 	eth_device_ref device;
 	int index;
-	measured_string_t names[2] = {{str_dup("ETH_MODE"), 8}, {str_dup("ETH_DUMMY"), 9}};
+	measured_string_t names[2] = {
+		{
+			str_dup("ETH_MODE"),
+			8
+		},
+		{
+			str_dup("ETH_DUMMY"),
+			9
+		}
+	};
 	measured_string_ref configuration;
 	size_t count = sizeof(names) / sizeof(measured_string_t);
-	char * data;
+	char *data;
 	eth_proto_ref proto;
 
@@ -323,96 +300,129 @@
 	// an existing device?
 	device = eth_devices_find(&eth_globals.devices, device_id);
-	if(device){
-		if(device->service != service){
+	if (device) {
+		if (device->service != service) {
 			printf("Device %d already exists\n", device->device_id);
 			fibril_rwlock_write_unlock(&eth_globals.devices_lock);
 			return EEXIST;
-		}else{
-			// update mtu
-			if((mtu > 0) && (mtu <= ETH_MAX_TAGGED_CONTENT(device->flags))){
-				device->mtu = mtu;
-			}else{
-				 device->mtu = ETH_MAX_TAGGED_CONTENT(device->flags);
+		}
+		
+		// update mtu
+		if ((mtu > 0) && (mtu <= ETH_MAX_TAGGED_CONTENT(device->flags)))
+			device->mtu = mtu;
+		else
+			device->mtu = ETH_MAX_TAGGED_CONTENT(device->flags);
+		
+		printf("Device %d already exists:\tMTU\t= %d\n",
+		    device->device_id, device->mtu);
+		fibril_rwlock_write_unlock(&eth_globals.devices_lock);
+		
+		// notify all upper layer modules
+		fibril_rwlock_read_lock(&eth_globals.protos_lock);
+		for (index = 0; index < eth_protos_count(&eth_globals.protos);
+		    index++) {
+			proto = eth_protos_get_index(&eth_globals.protos,
+			    index);
+			if (proto->phone) {
+				il_mtu_changed_msg(proto->phone,
+				    device->device_id, device->mtu,
+				    proto->service);
 			}
-			printf("Device %d already exists:\tMTU\t= %d\n", device->device_id, device->mtu);
-			fibril_rwlock_write_unlock(&eth_globals.devices_lock);
-			// notify all upper layer modules
-			fibril_rwlock_read_lock(&eth_globals.protos_lock);
-			for(index = 0; index < eth_protos_count(&eth_globals.protos); ++ index){
-				proto = eth_protos_get_index(&eth_globals.protos, index);
-				if (proto->phone){
-					il_mtu_changed_msg(proto->phone, device->device_id, device->mtu, proto->service);
-				}
-			}
-			fibril_rwlock_read_unlock(&eth_globals.protos_lock);
-			return EOK;
-		}
-	}else{
-		// create a new device
-		device = (eth_device_ref) malloc(sizeof(eth_device_t));
-		if(! device){
-			return ENOMEM;
-		}
-		device->device_id = device_id;
-		device->service = service;
-		device->flags = 0;
-		if((mtu > 0) && (mtu <= ETH_MAX_TAGGED_CONTENT(device->flags))){
-			device->mtu = mtu;
-		}else{
-			 device->mtu = ETH_MAX_TAGGED_CONTENT(device->flags);
-		}
-		configuration = &names[0];
-		if(ERROR_OCCURRED(net_get_device_conf_req(eth_globals.net_phone, device->device_id, &configuration, count, &data))){
-			fibril_rwlock_write_unlock(&eth_globals.devices_lock);
-			free(device);
-			return ERROR_CODE;
-		}
-		if(configuration){
-			if(! str_lcmp(configuration[0].value, "DIX", configuration[0].length)){
-				device->flags |= ETH_DIX;
-			}else if(! str_lcmp(configuration[0].value, "8023_2_LSAP", configuration[0].length)){
-				device->flags |= ETH_8023_2_LSAP;
-			}else device->flags |= ETH_8023_2_SNAP;
-			if((configuration[1].value) && (configuration[1].value[0] == 'y')){
-				device->flags |= ETH_DUMMY;
-			}
-			net_free_settings(configuration, data);
-		}else{
+		}
+		fibril_rwlock_read_unlock(&eth_globals.protos_lock);
+		return EOK;
+	}
+	
+	// create a new device
+	device = (eth_device_ref) malloc(sizeof(eth_device_t));
+	if (!device)
+		return ENOMEM;
+
+	device->device_id = device_id;
+	device->service = service;
+	device->flags = 0;
+	if ((mtu > 0) && (mtu <= ETH_MAX_TAGGED_CONTENT(device->flags)))
+		device->mtu = mtu;
+	else
+		device->mtu = ETH_MAX_TAGGED_CONTENT(device->flags);
+
+	configuration = &names[0];
+	if (ERROR_OCCURRED(net_get_device_conf_req(eth_globals.net_phone,
+	    device->device_id, &configuration, count, &data))) {
+		fibril_rwlock_write_unlock(&eth_globals.devices_lock);
+		free(device);
+		return ERROR_CODE;
+	}
+	if (configuration) {
+		if (!str_lcmp(configuration[0].value, "DIX",
+		    configuration[0].length)) {
+			device->flags |= ETH_DIX;
+		} else if(!str_lcmp(configuration[0].value, "8023_2_LSAP",
+		    configuration[0].length)) {
+			device->flags |= ETH_8023_2_LSAP;
+		} else {
 			device->flags |= ETH_8023_2_SNAP;
 		}
-		// bind the device driver
-		device->phone = netif_bind_service(device->service, device->device_id, SERVICE_ETHERNET, eth_receiver);
-		if(device->phone < 0){
-			fibril_rwlock_write_unlock(&eth_globals.devices_lock);
-			free(device);
-			return device->phone;
-		}
-		// get hardware address
-		if(ERROR_OCCURRED(netif_get_addr_req(device->phone, device->device_id, &device->addr, &device->addr_data))){
-			fibril_rwlock_write_unlock(&eth_globals.devices_lock);
-			free(device);
-			return ERROR_CODE;
-		}
-		// add to the cache
-		index = eth_devices_add(&eth_globals.devices, device->device_id, device);
-		if(index < 0){
-			fibril_rwlock_write_unlock(&eth_globals.devices_lock);
-			free(device->addr);
-			free(device->addr_data);
-			free(device);
-			return index;
-		}
-		printf("%s: Device registered (id: %d, service: %d: mtu: %d, "
-		    "mac: %x:%x:%x:%x:%x:%x, flags: 0x%x)\n",
-		    NAME, device->device_id, device->service, device->mtu,
-		    device->addr_data[0], device->addr_data[1],
-		    device->addr_data[2], device->addr_data[3],
-		    device->addr_data[4], device->addr_data[5], device->flags);
-	}
+		
+		if (configuration[1].value &&
+		    (configuration[1].value[0] == 'y')) {
+			device->flags |= ETH_DUMMY;
+		}
+		net_free_settings(configuration, data);
+	} else {
+		device->flags |= ETH_8023_2_SNAP;
+	}
+	
+	// bind the device driver
+	device->phone = netif_bind_service(device->service, device->device_id,
+	    SERVICE_ETHERNET, eth_receiver);
+	if (device->phone < 0) {
+		fibril_rwlock_write_unlock(&eth_globals.devices_lock);
+		free(device);
+		return device->phone;
+	}
+	
+	// get hardware address
+	if (ERROR_OCCURRED(netif_get_addr_req(device->phone, device->device_id,
+	    &device->addr, &device->addr_data))) {
+		fibril_rwlock_write_unlock(&eth_globals.devices_lock);
+		free(device);
+		return ERROR_CODE;
+	}
+	
+	// add to the cache
+	index = eth_devices_add(&eth_globals.devices, device->device_id,
+	    device);
+	if (index < 0) {
+		fibril_rwlock_write_unlock(&eth_globals.devices_lock);
+		free(device->addr);
+		free(device->addr_data);
+		free(device);
+		return index;
+	}
+	
+	printf("%s: Device registered (id: %d, service: %d: mtu: %d, "
+	    "mac: %x:%x:%x:%x:%x:%x, flags: 0x%x)\n",
+	    NAME, device->device_id, device->service, device->mtu,
+	    device->addr_data[0], device->addr_data[1],
+	    device->addr_data[2], device->addr_data[3],
+	    device->addr_data[4], device->addr_data[5], device->flags);
+
 	fibril_rwlock_write_unlock(&eth_globals.devices_lock);
 	return EOK;
 }
 
-eth_proto_ref eth_process_packet(int flags, packet_t packet){
+/** Processes the received packet and chooses the target registered module.
+ *
+ * @param[in] flags	The device flags.
+ * @param[in] packet	The packet.
+ * @returns		The target registered module.
+ * @returns		NULL if the packet is not long enough.
+ * @returns		NULL if the packet is too long.
+ * @returns		NULL if the raw ethernet protocol is used.
+ * @returns		NULL if the dummy device FCS checksum is invalid.
+ * @returns		NULL if the packet address length is not big enough.
+ */
+static eth_proto_ref eth_process_packet(int flags, packet_t packet)
+{
 	ERROR_DECLARE;
 
@@ -426,12 +436,16 @@
 
 	length = packet_get_data_length(packet);
-	if(IS_DUMMY(flags)){
+	
+	if (IS_DUMMY(flags))
 		packet_trim(packet, sizeof(eth_preamble_t), 0);
-	}
-	if(length < sizeof(eth_header_t) + ETH_MIN_CONTENT + (IS_DUMMY(flags) ? ETH_SUFFIX : 0)) return NULL;
+	if (length < sizeof(eth_header_t) + ETH_MIN_CONTENT +
+	    (IS_DUMMY(flags) ? ETH_SUFFIX : 0))
+		return NULL;
+	
 	data = packet_get_data(packet);
 	header = (eth_header_snap_ref) data;
 	type = ntohs(header->header.ethertype);
-	if(type >= ETH_MIN_PROTO){
+	
+	if (type >= ETH_MIN_PROTO) {
 		// DIX Ethernet
 		prefix = sizeof(eth_header_t);
@@ -439,42 +453,53 @@
 		fcs = (eth_fcs_ref) data + length - sizeof(eth_fcs_t);
 		length -= sizeof(eth_fcs_t);
-	}else if(type <= ETH_MAX_CONTENT){
+	} else if(type <= ETH_MAX_CONTENT) {
 		// translate "LSAP" values
-		if((header->lsap.dsap == ETH_LSAP_GLSAP) && (header->lsap.ssap == ETH_LSAP_GLSAP)){
+		if ((header->lsap.dsap == ETH_LSAP_GLSAP) &&
+		    (header->lsap.ssap == ETH_LSAP_GLSAP)) {
 			// raw packet
 			// discard
 			return NULL;
-		}else if((header->lsap.dsap == ETH_LSAP_SNAP) && (header->lsap.ssap == ETH_LSAP_SNAP)){
+		} else if((header->lsap.dsap == ETH_LSAP_SNAP) &&
+		    (header->lsap.ssap == ETH_LSAP_SNAP)) {
 			// IEEE 802.3 + 802.2 + LSAP + SNAP
 			// organization code not supported
 			type = ntohs(header->snap.ethertype);
-			prefix = sizeof(eth_header_t) + sizeof(eth_header_lsap_t) + sizeof(eth_header_snap_t);
-		}else{
+			prefix = sizeof(eth_header_t) +
+			    sizeof(eth_header_lsap_t) +
+			    sizeof(eth_header_snap_t);
+		} else {
 			// IEEE 802.3 + 802.2 LSAP
 			type = lsap_map(header->lsap.dsap);
-			prefix = sizeof(eth_header_t) + sizeof(eth_header_lsap_t);
-		}
-		suffix = (type < ETH_MIN_CONTENT) ? ETH_MIN_CONTENT - type : 0u;
+			prefix = sizeof(eth_header_t) +
+			    sizeof(eth_header_lsap_t);
+		}
+		suffix = (type < ETH_MIN_CONTENT) ? ETH_MIN_CONTENT - type : 0U;
 		fcs = (eth_fcs_ref) data + prefix + type + suffix;
 		suffix += length - prefix - type;
 		length = prefix + type + suffix;
-	}else{
+	} else {
 		// invalid length/type, should not occurr
 		return NULL;
 	}
-	if(IS_DUMMY(flags)){
-		if((~ compute_crc32(~ 0u, data, length * 8)) != ntohl(*fcs)){
+	
+	if (IS_DUMMY(flags)) {
+		if ((~compute_crc32(~0U, data, length * 8)) != ntohl(*fcs))
 			return NULL;
-		}
 		suffix += sizeof(eth_fcs_t);
 	}
-	if(ERROR_OCCURRED(packet_set_addr(packet, header->header.source_address, header->header.destination_address, ETH_ADDR))
-		|| ERROR_OCCURRED(packet_trim(packet, prefix, suffix))){
+	
+	if (ERROR_OCCURRED(packet_set_addr(packet,
+	    header->header.source_address, header->header.destination_address,
+	    ETH_ADDR)) || ERROR_OCCURRED(packet_trim(packet, prefix, suffix))) {
 		return NULL;
 	}
+	
 	return eth_protos_find(&eth_globals.protos, type);
 }
 
-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)
+{
 	eth_proto_ref proto;
 	packet_t next;
@@ -484,5 +509,5 @@
 	fibril_rwlock_read_lock(&eth_globals.devices_lock);
 	device = eth_devices_find(&eth_globals.devices, device_id);
-	if(! device){
+	if (!device) {
 		fibril_rwlock_read_unlock(&eth_globals.devices_lock);
 		return ENOENT;
@@ -490,29 +515,47 @@
 	flags = device->flags;
 	fibril_rwlock_read_unlock(&eth_globals.devices_lock);
+	
 	fibril_rwlock_read_lock(&eth_globals.protos_lock);
-	do{
+	do {
 		next = pq_detach(packet);
 		proto = eth_process_packet(flags, packet);
-		if(proto){
-			il_received_msg(proto->phone, device_id, packet, proto->service);
-		}else{
+		if (proto) {
+			il_received_msg(proto->phone, device_id, packet,
+			    proto->service);
+		} else {
 			// drop invalid/unknown
-			pq_release_remote(eth_globals.net_phone, packet_get_id(packet));
+			pq_release_remote(eth_globals.net_phone,
+			    packet_get_id(packet));
 		}
 		packet = next;
-	}while(packet);
+	} while(packet);
 	fibril_rwlock_read_unlock(&eth_globals.protos_lock);
+	
 	return EOK;
 }
 
-int eth_packet_space_message(device_id_t device_id, size_t * addr_len, size_t * prefix, size_t * content, size_t * suffix){
+/** Returns the device packet dimensions for sending.
+ *
+ * @param[in] device_id	The device identifier.
+ * @param[out] addr_len	The minimum reserved address length.
+ * @param[out] prefix	The minimum reserved prefix size.
+ * @param[out] content	The maximum content size.
+ * @param[out] suffix	The minimum reserved suffix size.
+ * @returns		EOK on success.
+ * @returns		EBADMEM if either one of the parameters is NULL.
+ * @returns		ENOENT if there is no such device.
+ */
+static int
+eth_packet_space_message(device_id_t device_id, size_t *addr_len,
+    size_t *prefix, size_t *content, size_t *suffix)
+{
 	eth_device_ref device;
 
-	if(!(addr_len && prefix && content && suffix)){
+	if (!addr_len || !prefix || !content || !suffix)
 		return EBADMEM;
-	}
+	
 	fibril_rwlock_read_lock(&eth_globals.devices_lock);
 	device = eth_devices_find(&eth_globals.devices, device_id);
-	if(! device){
+	if (!device) {
 		fibril_rwlock_read_unlock(&eth_globals.devices_lock);
 		return ENOENT;
@@ -520,4 +563,5 @@
 	*content = device->mtu;
 	fibril_rwlock_read_unlock(&eth_globals.devices_lock);
+	
 	*addr_len = ETH_ADDR;
 	*prefix = ETH_PREFIX;
@@ -526,16 +570,28 @@
 }
 
-int eth_addr_message(device_id_t device_id, eth_addr_type_t type, measured_string_ref * address){
+/** Returns the device hardware address.
+ *
+ * @param[in] device_id	The device identifier.
+ * @param[in] type	Type of the desired address.
+ * @param[out] address	The device hardware address.
+ * @returns		EOK on success.
+ * @returns		EBADMEM if the address parameter is NULL.
+ * @returns		ENOENT if there no such device.
+ */
+static int
+eth_addr_message(device_id_t device_id, eth_addr_type_t type,
+    measured_string_ref *address)
+{
 	eth_device_ref device;
 
-	if(! address){
+	if (!address)
 		return EBADMEM;
-	}
-	if(type == ETH_BROADCAST_ADDR){
+
+	if (type == ETH_BROADCAST_ADDR) {
 		*address = eth_globals.broadcast_addr;
-	}else{
+	} else {
 		fibril_rwlock_read_lock(&eth_globals.devices_lock);
 		device = eth_devices_find(&eth_globals.devices, device_id);
-		if(! device){
+		if (!device) {
 			fibril_rwlock_read_unlock(&eth_globals.devices_lock);
 			return ENOENT;
@@ -544,8 +600,20 @@
 		fibril_rwlock_read_unlock(&eth_globals.devices_lock);
 	}
+	
 	return (*address) ? EOK : ENOENT;
 }
 
-int eth_register_message(services_t service, int phone){
+/** Registers receiving module service.
+ *
+ * Passes received packets for this service.
+ *
+ * @param[in] service	The module service.
+ * @param[in] phone	The service phone.
+ * @returns		EOK on success.
+ * @returns		ENOENT if the service is not known.
+ * @returns		ENOMEM if there is not enough memory left.
+ */
+static int eth_register_message(services_t service, int phone)
+{
 	eth_proto_ref proto;
 	int protocol;
@@ -553,16 +621,16 @@
 
 	protocol = protocol_map(SERVICE_ETHERNET, service);
-	if(! protocol){
+	if (!protocol)
 		return ENOENT;
-	}
+
 	fibril_rwlock_write_lock(&eth_globals.protos_lock);
 	proto = eth_protos_find(&eth_globals.protos, protocol);
-	if(proto){
+	if (proto) {
 		proto->phone = phone;
 		fibril_rwlock_write_unlock(&eth_globals.protos_lock);
 		return EOK;
-	}else{
+	} else {
 		proto = (eth_proto_ref) malloc(sizeof(eth_proto_t));
-		if(! proto){
+		if (!proto) {
 			fibril_rwlock_write_unlock(&eth_globals.protos_lock);
 			return ENOMEM;
@@ -572,5 +640,5 @@
 		proto->phone = phone;
 		index = eth_protos_add(&eth_globals.protos, protocol, proto);
-		if(index < 0){
+		if (index < 0) {
 			fibril_rwlock_write_unlock(&eth_globals.protos_lock);
 			free(proto);
@@ -579,6 +647,6 @@
 	}
 	
-	printf("%s: Protocol registered (protocol: %d, service: %d, phone: %d)\n",
-	    NAME, proto->protocol, proto->service, proto->phone);
+	printf("%s: Protocol registered (protocol: %d, service: %d, phone: "
+	    "%d)\n", NAME, proto->protocol, proto->service, proto->phone);
 	
 	fibril_rwlock_write_unlock(&eth_globals.protos_lock);
@@ -586,49 +654,66 @@
 }
 
-int eth_prepare_packet(int flags, packet_t packet, uint8_t * src_addr, int ethertype, size_t mtu){
+/** Prepares the packet for sending.
+ *
+ * @param[in] flags	The device flags.
+ * @param[in] packet	The packet.
+ * @param[in] src_addr	The source hardware address.
+ * @param[in] ethertype	The ethernet protocol type.
+ * @param[in] mtu	The device maximum transmission unit.
+ * @returns		EOK on success.
+ * @returns		EINVAL if the packet addresses length is not long
+ *			enough.
+ * @returns		EINVAL if the packet is bigger than the device MTU.
+ * @returns		ENOMEM if there is not enough memory in the packet.
+ */
+static int
+eth_prepare_packet(int flags, packet_t packet, uint8_t *src_addr, int ethertype,
+    size_t mtu)
+{
 	eth_header_snap_ref header;
 	eth_header_lsap_ref header_lsap;
 	eth_header_ref header_dix;
 	eth_fcs_ref fcs;
-	uint8_t * src;
-	uint8_t * dest;
+	uint8_t *src;
+	uint8_t *dest;
 	size_t length;
 	int i;
-	void * padding;
+	void *padding;
 	eth_preamble_ref preamble;
 
 	i = packet_get_addr(packet, &src, &dest);
-	if(i < 0){
+	if (i < 0)
 		return i;
-	}
-	if(i != ETH_ADDR){
+	if (i != ETH_ADDR)
 		return EINVAL;
-	}
+
 	length = packet_get_data_length(packet);
-	if(length > mtu){
+	if (length > mtu)
 		return EINVAL;
-	}
-	if(length < ETH_MIN_TAGGED_CONTENT(flags)){
-		padding = packet_suffix(packet, ETH_MIN_TAGGED_CONTENT(flags) - length);
-		if(! padding){
+	
+	if (length < ETH_MIN_TAGGED_CONTENT(flags)) {
+		padding = packet_suffix(packet,
+		    ETH_MIN_TAGGED_CONTENT(flags) - length);
+		if (!padding)
 			return ENOMEM;
-		}
 		bzero(padding, ETH_MIN_TAGGED_CONTENT(flags) - length);
 	}
-	if(IS_DIX(flags)){
+	
+	if (IS_DIX(flags)) {
 		header_dix = PACKET_PREFIX(packet, eth_header_t);
-		if(! header_dix){
+		if (!header_dix)
 			return ENOMEM;
-		}
+		
 		header_dix->ethertype = (uint16_t) ethertype;
 		memcpy(header_dix->source_address, src_addr, ETH_ADDR);
 		memcpy(header_dix->destination_address, dest, ETH_ADDR);
 		src = &header_dix->destination_address[0];
-	}else if(IS_8023_2_LSAP(flags)){
+	} else if(IS_8023_2_LSAP(flags)) {
 		header_lsap = PACKET_PREFIX(packet, eth_header_lsap_t);
-		if(! header_lsap){
+		if (!header_lsap)
 			return ENOMEM;
-		}
-		header_lsap->header.ethertype = htons(length + sizeof(eth_header_lsap_t));
+		
+		header_lsap->header.ethertype = htons(length +
+		    sizeof(eth_header_lsap_t));
 		header_lsap->lsap.dsap = lsap_unmap(ntohs(ethertype));
 		header_lsap->lsap.ssap = header_lsap->lsap.dsap;
@@ -637,16 +722,18 @@
 		memcpy(header_lsap->header.destination_address, dest, ETH_ADDR);
 		src = &header_lsap->header.destination_address[0];
-	}else if(IS_8023_2_SNAP(flags)){
+	} else if(IS_8023_2_SNAP(flags)) {
 		header = PACKET_PREFIX(packet, eth_header_snap_t);
-		if(! header){
+		if (!header)
 			return ENOMEM;
-		}
-		header->header.ethertype = htons(length + sizeof(eth_header_lsap_t) + sizeof(eth_header_snap_t));
+		
+		header->header.ethertype = htons(length +
+		    sizeof(eth_header_lsap_t) + sizeof(eth_header_snap_t));
 		header->lsap.dsap = (uint16_t) ETH_LSAP_SNAP;
 		header->lsap.ssap = header->lsap.dsap;
 		header->lsap.ctrl = IEEE_8023_2_UI;
-		for(i = 0; i < 3; ++ i){
+		
+		for (i = 0; i < 3; ++ i)
 			header->snap.protocol[i] = 0;
-		}
+		
 		header->snap.ethertype = (uint16_t) ethertype;
 		memcpy(header->header.source_address, src_addr, ETH_ADDR);
@@ -654,23 +741,40 @@
 		src = &header->header.destination_address[0];
 	}
-	if(IS_DUMMY(flags)){
+	
+	if (IS_DUMMY(flags)) {
 		preamble = PACKET_PREFIX(packet, eth_preamble_t);
-		if(! preamble){
+		if (!preamble)
 			return ENOMEM;
-		}
-		for(i = 0; i < 7; ++ i){
+		
+		for (i = 0; i < 7; ++ i)
 			preamble->preamble[i] = ETH_PREAMBLE;
-		}
+		
 		preamble->sfd = ETH_SFD;
+		
 		fcs = PACKET_SUFFIX(packet, eth_fcs_t);
-		if(! fcs){
+		if (!fcs)
 			return ENOMEM;
-		}
-		*fcs = htonl(~ compute_crc32(~ 0u, src, length * 8));
-	}
+
+		*fcs = htonl(~compute_crc32(~0U, src, length * 8));
+	}
+	
 	return EOK;
 }
 
-int eth_send_message(device_id_t device_id, packet_t packet, services_t sender){
+/** Sends the packet queue.
+ *
+ * Sends only packet successfully processed by the eth_prepare_packet()
+ * function.
+ *
+ * @param[in] device_id	The device identifier.
+ * @param[in] packet	The packet queue.
+ * @param[in] sender	The sending module service.
+ * @returns		EOK on success.
+ * @returns		ENOENT if there no such device.
+ * @returns		EINVAL if the service parameter is not known.
+ */
+static int
+eth_send_message(device_id_t device_id, packet_t packet, services_t sender)
+{
 	ERROR_DECLARE;
 
@@ -681,38 +785,45 @@
 
 	ethertype = htons(protocol_map(SERVICE_ETHERNET, sender));
-	if(! ethertype){
+	if (!ethertype) {
 		pq_release_remote(eth_globals.net_phone, packet_get_id(packet));
 		return EINVAL;
 	}
+	
 	fibril_rwlock_read_lock(&eth_globals.devices_lock);
 	device = eth_devices_find(&eth_globals.devices, device_id);
-	if(! device){
+	if (!device) {
 		fibril_rwlock_read_unlock(&eth_globals.devices_lock);
 		return ENOENT;
 	}
+	
 	// process packet queue
 	next = packet;
-	do{
-		if(ERROR_OCCURRED(eth_prepare_packet(device->flags, next, (uint8_t *) device->addr->value, ethertype, device->mtu))){
+	do {
+		if (ERROR_OCCURRED(eth_prepare_packet(device->flags, next,
+		    (uint8_t *) device->addr->value, ethertype, device->mtu))) {
 			// release invalid packet
 			tmp = pq_detach(next);
-			if(next == packet){
+			if (next == packet)
 				packet = tmp;
-			}
-			pq_release_remote(eth_globals.net_phone, packet_get_id(next));
+			pq_release_remote(eth_globals.net_phone,
+			    packet_get_id(next));
 			next = tmp;
-		}else{
+		} else {
 			next = pq_next(next);
 		}
-	}while(next);
+	} while(next);
+	
 	// send packet queue
-	if(packet){
-		netif_send_msg(device->phone, device_id, packet, SERVICE_ETHERNET);
+	if (packet) {
+		netif_send_msg(device->phone, device_id, packet,
+		    SERVICE_ETHERNET);
 	}
 	fibril_rwlock_read_unlock(&eth_globals.devices_lock);
+	
 	return EOK;
 }
 
-int nil_message_standalone(const char *name, ipc_callid_t callid, ipc_call_t *call,
+int
+nil_message_standalone(const char *name, ipc_callid_t callid, ipc_call_t *call,
     ipc_call_t *answer, int *answer_count)
 {
@@ -728,34 +839,35 @@
 	*answer_count = 0;
 	switch (IPC_GET_METHOD(*call)) {
-		case IPC_M_PHONE_HUNGUP:
-			return EOK;
-		case NET_NIL_DEVICE:
-			return eth_device_message(IPC_GET_DEVICE(call),
-			    IPC_GET_SERVICE(call), IPC_GET_MTU(call));
-		case NET_NIL_SEND:
-			ERROR_PROPAGATE(packet_translate_remote(eth_globals.net_phone, &packet,
-			    IPC_GET_PACKET(call)));
-			return eth_send_message(IPC_GET_DEVICE(call), packet,
-			    IPC_GET_SERVICE(call));
-		case NET_NIL_PACKET_SPACE:
-			ERROR_PROPAGATE(eth_packet_space_message(IPC_GET_DEVICE(call),
-			    &addrlen, &prefix, &content, &suffix));
-			IPC_SET_ADDR(answer, addrlen);
-			IPC_SET_PREFIX(answer, prefix);
-			IPC_SET_CONTENT(answer, content);
-			IPC_SET_SUFFIX(answer, suffix);
-			*answer_count = 4;
-			return EOK;
-		case NET_NIL_ADDR:
-			ERROR_PROPAGATE(eth_addr_message(IPC_GET_DEVICE(call),
-			    ETH_LOCAL_ADDR, &address));
-			return measured_strings_reply(address, 1);
-		case NET_NIL_BROADCAST_ADDR:
-			ERROR_PROPAGATE(eth_addr_message(IPC_GET_DEVICE(call),
-			    ETH_BROADCAST_ADDR, &address));
-			return measured_strings_reply(address, 1);
-		case IPC_M_CONNECT_TO_ME:
-			return eth_register_message(NIL_GET_PROTO(call),
-			    IPC_GET_PHONE(call));
+	case IPC_M_PHONE_HUNGUP:
+		return EOK;
+	
+	case NET_NIL_DEVICE:
+		return eth_device_message(IPC_GET_DEVICE(call),
+		    IPC_GET_SERVICE(call), IPC_GET_MTU(call));
+	case NET_NIL_SEND:
+		ERROR_PROPAGATE(packet_translate_remote(eth_globals.net_phone,
+		    &packet, IPC_GET_PACKET(call)));
+		return eth_send_message(IPC_GET_DEVICE(call), packet,
+		    IPC_GET_SERVICE(call));
+	case NET_NIL_PACKET_SPACE:
+		ERROR_PROPAGATE(eth_packet_space_message(IPC_GET_DEVICE(call),
+		    &addrlen, &prefix, &content, &suffix));
+		IPC_SET_ADDR(answer, addrlen);
+		IPC_SET_PREFIX(answer, prefix);
+		IPC_SET_CONTENT(answer, content);
+		IPC_SET_SUFFIX(answer, suffix);
+		*answer_count = 4;
+		return EOK;
+	case NET_NIL_ADDR:
+		ERROR_PROPAGATE(eth_addr_message(IPC_GET_DEVICE(call),
+		    ETH_LOCAL_ADDR, &address));
+		return measured_strings_reply(address, 1);
+	case NET_NIL_BROADCAST_ADDR:
+		ERROR_PROPAGATE(eth_addr_message(IPC_GET_DEVICE(call),
+		    ETH_BROADCAST_ADDR, &address));
+		return measured_strings_reply(address, 1);
+	case IPC_M_CONNECT_TO_ME:
+		return eth_register_message(NIL_GET_PROTO(call),
+		    IPC_GET_PHONE(call));
 	}
 	
@@ -763,33 +875,8 @@
 }
 
-void eth_receiver(ipc_callid_t iid, ipc_call_t * icall){
-	ERROR_DECLARE;
-
-	packet_t packet;
-
-	while(true){
-//		printf("message %d - %d\n", IPC_GET_METHOD(*icall), NET_NIL_FIRST);
-		switch(IPC_GET_METHOD(*icall)){
-			case NET_NIL_DEVICE_STATE:
-				nil_device_state_msg_local(0, IPC_GET_DEVICE(icall), IPC_GET_STATE(icall));
-				ipc_answer_0(iid, EOK);
-				break;
-			case NET_NIL_RECEIVED:
-				if(! ERROR_OCCURRED(packet_translate_remote(eth_globals.net_phone, &packet, IPC_GET_PACKET(icall)))){
-					ERROR_CODE = nil_received_msg_local(0, IPC_GET_DEVICE(icall), packet, 0);
-				}
-				ipc_answer_0(iid, (ipcarg_t) ERROR_CODE);
-				break;
-			default:
-				ipc_answer_0(iid, (ipcarg_t) ENOTSUP);
-		}
-		iid = async_get_call(icall);
-	}
-}
-
 /** Default thread for new connections.
  *
- * @param[in] iid The initial message identifier.
- * @param[in] icall The initial message call structure.
+ * @param[in] iid	The initial message identifier.
+ * @param[in] icall	The initial message call structure.
  *
  */
@@ -802,5 +889,5 @@
 	ipc_answer_0(iid, EOK);
 	
-	while(true) {
+	while (true) {
 		ipc_call_t answer;
 		int answer_count;
@@ -814,9 +901,13 @@
 		
 		/* Process the message */
-		int res = nil_module_message_standalone(NAME, callid, &call, &answer,
-		    &answer_count);
-		
-		/* End if said to either by the message or the processing result */
-		if ((IPC_GET_METHOD(call) == IPC_M_PHONE_HUNGUP) || (res == EHANGUP))
+		int res = nil_module_message_standalone(NAME, callid, &call,
+		    &answer, &answer_count);
+		
+		/*
+		 * End if told to either by the message or the processing
+		 * result.
+		 */
+		if ((IPC_GET_METHOD(call) == IPC_M_PHONE_HUNGUP) ||
+		    (res == EHANGUP))
 			return;
 		
@@ -831,7 +922,5 @@
 	
 	/* Start the module */
-	if (ERROR_OCCURRED(nil_module_start_standalone(nil_client_connection)))
-		return ERROR_CODE;
-	
+	ERROR_PROPAGATE(nil_module_start_standalone(nil_client_connection));
 	return EOK;
 }
Index: uspace/srv/net/nil/eth/eth.h
===================================================================
--- uspace/srv/net/nil/eth/eth.h	(revision 30b2d0246adda2ba3bca8b47747fe929352297df)
+++ uspace/srv/net/nil/eth/eth.h	(revision 6067284b6f44b70fbfd9b716f22ee20692b884f6)
@@ -32,9 +32,9 @@
 
 /** @file
- *  Ethernet module.
+ * Ethernet module.
  */
 
-#ifndef __NET_ETH_H__
-#define __NET_ETH_H__
+#ifndef NET_ETH_H_
+#define NET_ETH_H_
 
 #include <fibril_synch.h>
@@ -45,103 +45,92 @@
 
 /** Type definition of the Ethernet global data.
- *  @see eth_globals
+ * @see eth_globals
  */
-typedef struct eth_globals	eth_globals_t;
+typedef struct eth_globals eth_globals_t;
 
 /** Type definition of the Ethernet device specific data.
- *  @see eth_device
+ * @see eth_device
  */
-typedef struct eth_device	eth_device_t;
+typedef struct eth_device eth_device_t;
 
 /** Type definition of the Ethernet device specific data pointer.
- *  @see eth_device
+ * @see eth_device
  */
-typedef eth_device_t *		eth_device_ref;
+typedef eth_device_t *eth_device_ref;
 
 /** Type definition of the Ethernet protocol specific data.
- *  @see eth_proto
+ * @see eth_proto
  */
-typedef struct eth_proto	eth_proto_t;
+typedef struct eth_proto eth_proto_t;
 
 /** Type definition of the Ethernet protocol specific data pointer.
- *  @see eth_proto
+ * @see eth_proto
  */
-typedef eth_proto_t *		eth_proto_ref;
+typedef eth_proto_t *eth_proto_ref;
 
 /** Ethernet device map.
- *  Maps devices to the Ethernet device specific data.
- *  @see device.h
+ * Maps devices to the Ethernet device specific data.
+ * @see device.h
  */
-DEVICE_MAP_DECLARE(eth_devices, eth_device_t)
+DEVICE_MAP_DECLARE(eth_devices, eth_device_t);
 
 /** Ethernet protocol map.
- *  Maps protocol identifiers to the Ethernet protocol specific data.
- *  @see int_map.h
+ * Maps protocol identifiers to the Ethernet protocol specific data.
+ * @see int_map.h
  */
-INT_MAP_DECLARE(eth_protos, eth_proto_t)
+INT_MAP_DECLARE(eth_protos, eth_proto_t);
 
-/** Ethernet device specific data.
- */
-struct	eth_device{
-	/** Device identifier.
-	 */
+/** Ethernet device specific data. */
+struct eth_device {
+	/** Device identifier. */
 	device_id_t device_id;
-	/** Device driver service.
-	 */
+	/** Device driver service. */
 	services_t service;
-	/** Driver phone.
-	 */
+	/** Driver phone. */
 	int phone;
-	/** Maximal transmission unit.
-	 */
+	/** Maximal transmission unit. */
 	size_t mtu;
-	/** Various device flags.
-	 *  @see ETH_DUMMY
-	 *  @see ETH_MODE_MASK
+	
+	/**
+	 * Various device flags.
+	 * @see ETH_DUMMY
+	 * @see ETH_MODE_MASK
 	 */
 	int flags;
-	/** Actual device hardware address.
-	 */
+	
+	/** Actual device hardware address. */
 	measured_string_ref addr;
-	/** Actual device hardware address data.
-	 */
-	char * addr_data;
+	/** Actual device hardware address data. */
+	char *addr_data;
 };
 
-/** Ethernet protocol specific data.
- */
-struct eth_proto{
-	/** Protocol service.
-	 */
+/** Ethernet protocol specific data. */
+struct eth_proto {
+	/** Protocol service. */
 	services_t service;
-	/** Protocol identifier.
-	 */
+	/** Protocol identifier. */
 	int protocol;
-	/** Protocol module phone.
-	 */
+	/** Protocol module phone. */
 	int phone;
 };
 
-/** Ethernet global data.
- */
-struct	eth_globals{
-	/** Networking module phone.
-	 */
+/** Ethernet global data. */
+struct eth_globals {
+	/** Networking module phone. */
 	int net_phone;
-	/** Safety lock for devices.
-	 */
+	/** Safety lock for devices. */
 	fibril_rwlock_t devices_lock;
-	/** All known Ethernet devices.
-	 */
+	/** All known Ethernet devices. */
 	eth_devices_t devices;
-	/** Safety lock for protocols.
-	 */
+	/** Safety lock for protocols. */
 	fibril_rwlock_t protos_lock;
-	/** Protocol map.
-	 *  Service phone map for each protocol.
+	
+	/**
+	 * Protocol map.
+	 * Service phone map for each protocol.
 	 */
 	eth_protos_t protos;
-	/** Broadcast device hardware address.
-	 */
+	
+	/** Broadcast device hardware address. */
 	measured_string_ref broadcast_addr;
 };
Index: uspace/srv/net/nil/eth/eth_header.h
===================================================================
--- uspace/srv/net/nil/eth/eth_header.h	(revision 30b2d0246adda2ba3bca8b47747fe929352297df)
+++ uspace/srv/net/nil/eth/eth_header.h	(revision 6067284b6f44b70fbfd9b716f22ee20692b884f6)
@@ -32,101 +32,103 @@
 
 /** @file
- *  Ethernet protocol header definitions.
- *  Based on the IEEE~802.3-2005
- */
-
-#ifndef __NET_ETH_HEADER_H__
-#define __NET_ETH_HEADER_H__
+ * Ethernet protocol header definitions.
+ * Based on the IEEE 802.3-2005
+ */
+
+#ifndef NET_ETH_HEADER_H_
+#define NET_ETH_HEADER_H_
 
 #include <sys/types.h>
 
-/** Ethernet address length.
- */
-#define ETH_ADDR		6
-
-/** Ethernet header preamble value.
- */
+/** Ethernet address length. */
+#define ETH_ADDR	6
+
+/** Ethernet header preamble value. */
 #define ETH_PREAMBLE	0x55
 
-/** Ethernet header start of frame value.
- */
-#define ETH_SFD			0xD5
-
-/** IEEE 802.2 unordered information control field.
- */
+/** Ethernet header start of frame value. */
+#define ETH_SFD		0xD5
+
+/** IEEE 802.2 unordered information control field. */
 #define IEEE_8023_2_UI	0x03
 
 /** Type definition of the Ethernet header IEEE 802.3 + 802.2 + SNAP extensions.
- *  @see eth_header_snap
- */
-typedef struct eth_header_snap	eth_header_snap_t;
-
-/** Type definition of the Ethernet header IEEE 802.3 + 802.2 + SNAP extensions pointer.
- *  @see eth_header_snap
- */
-typedef eth_header_snap_t *		eth_header_snap_ref;
+ * @see eth_header_snap
+ */
+typedef struct eth_header_snap eth_header_snap_t;
+
+/** Type definition of the Ethernet header IEEE 802.3 + 802.2 + SNAP extensions
+ * pointer.
+ *
+ * @see eth_header_snap
+ */
+typedef eth_header_snap_t *eth_header_snap_ref;
 
 /** Type definition of the Ethernet header IEEE 802.3 + 802.2 + SNAP extensions.
- *  @see eth_header_lsap
- */
-typedef struct eth_header_lsap	eth_header_lsap_t;
+ * @see eth_header_lsap
+ */
+typedef struct eth_header_lsap eth_header_lsap_t;
 
 /** Type definition of the Ethernet header IEEE 802.3 + 802.2 extension pointer.
- *  @see eth_header_lsap
- */
-typedef eth_header_lsap_t *		eth_header_lsap_ref;
+ * @see eth_header_lsap
+ */
+typedef eth_header_lsap_t *eth_header_lsap_ref;
 
 /** Type definition of the Ethernet header LSAP extension.
- *  @see eth_ieee_lsap
- */
-typedef struct eth_ieee_lsap	eth_ieee_lsap_t;
+ * @see eth_ieee_lsap
+ */
+typedef struct eth_ieee_lsap eth_ieee_lsap_t;
 
 /** Type definition of the Ethernet header LSAP extension pointer.
- *  @see eth_ieee_lsap
- */
-typedef eth_ieee_lsap_t *		eth_ieee_lsap_ref;
+ * @see eth_ieee_lsap
+ */
+typedef eth_ieee_lsap_t *eth_ieee_lsap_ref;
 
 /** Type definition of the Ethernet header SNAP extension.
- *  @see eth_snap
- */
-typedef struct eth_snap		eth_snap_t;
+ * @see eth_snap
+ */
+typedef struct eth_snap eth_snap_t;
 
 /** Type definition of the Ethernet header SNAP extension pointer.
- *  @see eth_snap
- */
-typedef eth_snap_t *		eth_snap_ref;
+ * @see eth_snap
+ */
+typedef eth_snap_t *eth_snap_ref;
 
 /** Type definition of the Ethernet header preamble.
- *  @see preamble
- */
-typedef struct eth_preamble	eth_preamble_t;
+ * @see preamble
+ */
+typedef struct eth_preamble eth_preamble_t;
 
 /** Type definition of the Ethernet header preamble pointer.
- *  @see eth_preamble
- */
-typedef eth_preamble_t *	eth_preamble_ref;
+ * @see eth_preamble
+ */
+typedef eth_preamble_t *eth_preamble_ref;
 
 /** Type definition of the Ethernet header.
- *  @see eth_header
- */
-typedef struct eth_header	eth_header_t;
+ * @see eth_header
+ */
+typedef struct eth_header eth_header_t;
 
 /** Type definition of the Ethernet header pointer.
- *  @see eth_header
- */
-typedef eth_header_t *		eth_header_ref;
-
-/** Ethernet header Link Service Access Point extension.
- */
-struct eth_ieee_lsap{
-	/** Destination Service Access Point identifier.
+ * @see eth_header
+ */
+typedef eth_header_t *eth_header_ref;
+
+/** Ethernet header Link Service Access Point extension. */
+struct eth_ieee_lsap {
+	/**
+	 * Destination Service Access Point identifier.
 	 * The possible values are assigned by an IEEE committee.
 	 */
 	uint8_t dsap;
-	/** Source Service Access Point identifier.
+	
+	/**
+	 * Source Service Access Point identifier.
 	 * The possible values are assigned by an IEEE committee.
 	 */
 	uint8_t ssap;
-	/** Control parameter.
+	
+	/**
+	 * Control parameter.
 	 * The possible values are assigned by an IEEE committee.
 	 */
@@ -134,12 +136,12 @@
 } __attribute__ ((packed));
 
-/** Ethernet header SNAP extension.
- */
-struct eth_snap{
-	/** Protocol identifier or organization code.
-	 */
+/** Ethernet header SNAP extension. */
+struct eth_snap {
+	/** Protocol identifier or organization code. */
 	uint8_t protocol[3];
-	/** Ethernet protocol identifier in the network byte order (big endian).
-	 *  @see ethernet_protocols.h
+	
+	/**
+	 * Ethernet protocol identifier in the network byte order (big endian).
+	 * @see ethernet_protocols.h
 	 */
 	uint16_t ethertype;
@@ -147,68 +149,76 @@
 
 /** Ethernet header preamble.
- *  Used for dummy devices.
- */
-struct eth_preamble{
-	/** Controlling preamble used for the frame transmission synchronization.
-	 *  All should be set to ETH_PREAMBLE.
+ *
+ * Used for dummy devices.
+ */
+struct eth_preamble {
+	/**
+	 * Controlling preamble used for the frame transmission synchronization.
+	 * All should be set to ETH_PREAMBLE.
 	 */
 	uint8_t preamble[7];
-	/** Start of Frame Delimiter used for the frame transmission synchronization.
-	 *  Should be set to ETH_SFD.
+	
+	/**
+	 * Start of Frame Delimiter used for the frame transmission
+	 * synchronization.
+	 * Should be set to ETH_SFD.
 	 */
 	uint8_t sfd;
 } __attribute__ ((packed));
 
-/** Ethernet header.
- */
-struct eth_header{
-	/** Destination host Ethernet address (MAC address).
-	 */
+/** Ethernet header. */
+struct eth_header {
+	/** Destination host Ethernet address (MAC address). */
 	uint8_t destination_address[ETH_ADDR];
-	/** Source host Ethernet address (MAC address).
-	 */
+	/** Source host Ethernet address (MAC address). */
 	uint8_t source_address[ETH_ADDR];
-	/** Ethernet protocol identifier in the network byte order (big endian).
-	 *  @see ethernet_protocols.h
+	
+	/**
+	 * Ethernet protocol identifier in the network byte order (big endian).
+	 * @see ethernet_protocols.h
 	 */
 	uint16_t ethertype;
 } __attribute__ ((packed));
 
-/** Ethernet header IEEE 802.3 + 802.2 extension.
- */
-struct eth_header_lsap{
-	/** Ethernet header.
-	 */
+/** Ethernet header IEEE 802.3 + 802.2 extension. */
+struct eth_header_lsap {
+	/** Ethernet header. */
 	eth_header_t header;
-	/** LSAP extension.
-	 *  If DSAP and SSAP are set to ETH_LSAP_SNAP the SNAP extension is being used.
-	 *  If DSAP and SSAP fields are equal to ETH_RAW the raw Ethernet packet without any extensions is being used and the frame content starts rigth after the two fields.
+	
+	/**
+	 * LSAP extension.
+	 * If DSAP and SSAP are set to ETH_LSAP_SNAP the SNAP extension is being
+	 * used.
+	 * If DSAP and SSAP fields are equal to ETH_RAW the raw Ethernet packet
+	 * without any extensions is being used and the frame content starts
+	 * rigth after the two fields.
 	 */
 	eth_ieee_lsap_t lsap;
 } __attribute__ ((packed));
 
-/** Ethernet header IEEE 802.3 + 802.2 + SNAP extensions.
- */
-struct eth_header_snap{
-	/** Ethernet header.
-	 */
+/** Ethernet header IEEE 802.3 + 802.2 + SNAP extensions. */
+struct eth_header_snap {
+	/** Ethernet header. */
 	eth_header_t header;
-	/** LSAP extension.
-	 *  If DSAP and SSAP are set to ETH_LSAP_SNAP the SNAP extension is being used.
-	 *  If DSAP and SSAP fields are equal to ETH_RAW the raw Ethernet packet without any extensions is being used and the frame content starts rigth after the two fields.
+	
+	/**
+	 * LSAP extension.
+	 * If DSAP and SSAP are set to ETH_LSAP_SNAP the SNAP extension is being
+	 * used.
+	 * If DSAP and SSAP fields are equal to ETH_RAW the raw Ethernet packet
+	 * without any extensions is being used and the frame content starts
+	 * rigth after the two fields.
 	 */
 	eth_ieee_lsap_t lsap;
-	/** SNAP extension.
-	 */
+	
+	/** SNAP extension. */
 	eth_snap_t snap;
 } __attribute__ ((packed));
 
-/** Ethernet Frame Check Sequence.
- */
-typedef uint32_t		eth_fcs_t;
-
-/** Ethernet Frame Check Sequence pointer.
- */
-typedef eth_fcs_t *		eth_fcs_ref;
+/** Ethernet Frame Check Sequence. */
+typedef uint32_t eth_fcs_t;
+
+/** Ethernet Frame Check Sequence pointer. */
+typedef eth_fcs_t *eth_fcs_ref;
 
 #endif
Index: uspace/srv/net/nil/eth/eth_module.c
===================================================================
--- uspace/srv/net/nil/eth/eth_module.c	(revision 30b2d0246adda2ba3bca8b47747fe929352297df)
+++ uspace/srv/net/nil/eth/eth_module.c	(revision 6067284b6f44b70fbfd9b716f22ee20692b884f6)
@@ -36,4 +36,6 @@
  */
 
+#include "eth.h"
+
 #include <async.h>
 #include <stdio.h>
@@ -48,6 +50,4 @@
 #include <nil_local.h>
 
-#include "eth.h"
-
 int nil_module_start_standalone(async_client_conn_t client_connection)
 {
@@ -59,6 +59,6 @@
 	
 	ipcarg_t phonehash;
-	if (ERROR_OCCURRED(nil_initialize(net_phone))
-	    || ERROR_OCCURRED(REGISTER_ME(SERVICE_ETHERNET, &phonehash))) {
+	if (ERROR_OCCURRED(nil_initialize(net_phone)) ||
+	    ERROR_OCCURRED(REGISTER_ME(SERVICE_ETHERNET, &phonehash))) {
 		pm_destroy();
 		return ERROR_CODE;
@@ -71,6 +71,7 @@
 }
 
-int nil_module_message_standalone(const char *name, ipc_callid_t callid, ipc_call_t *call,
-    ipc_call_t *answer, int *answer_count)
+int
+nil_module_message_standalone(const char *name, ipc_callid_t callid,
+    ipc_call_t *call, ipc_call_t *answer, int *answer_count)
 {
 	return nil_message_standalone(name, callid, call, answer, answer_count);