Index: uspace/srv/net/include/arp_interface.h
===================================================================
--- uspace/srv/net/include/arp_interface.h	(revision 8edacbce0741266516f28901a084219ffd7e4a9f)
+++ uspace/srv/net/include/arp_interface.h	(revision aadf01ebd2c032bc8dd43a6e06ae5715e6c2710f)
@@ -67,5 +67,5 @@
  *  @returns Other error codes as defined for the nil_get_broadcast_addr() function.
  */
-int	arp_device_req( int arp_phone, device_id_t device_id, services_t protocol, services_t netif, measured_string_ref address );
+int arp_device_req(int arp_phone, device_id_t device_id, services_t protocol, services_t netif, measured_string_ref address);
 
 /** Translates the given protocol address to the network interface address.
@@ -83,5 +83,5 @@
  *  @returns ENOENT if the mapping is not found.
  */
-int	arp_translate_req( int arp_phone, device_id_t device_id, services_t protocol, measured_string_ref address, measured_string_ref * translation, char ** data );
+int arp_translate_req(int arp_phone, device_id_t device_id, services_t protocol, measured_string_ref address, measured_string_ref * translation, char ** data);
 
 /** Clears the device cache.
@@ -91,5 +91,5 @@
  *  @returns ENOENT if the device is not found.
  */
-int	arp_clear_device_req( int arp_phone, device_id_t device_id );
+int arp_clear_device_req(int arp_phone, device_id_t device_id);
 
 /** Clears the given protocol address from the cache.
@@ -101,5 +101,5 @@
  *  @returns ENOENT if the mapping is not found.
  */
-int	arp_clear_address_req( int arp_phone, device_id_t device_id, services_t protocol, measured_string_ref address );
+int arp_clear_address_req(int arp_phone, device_id_t device_id, services_t protocol, measured_string_ref address);
 
 /** Cleans the cache.
@@ -107,5 +107,5 @@
  *  @returns EOK on success.
  */
-int	arp_clean_cache_req( int arp_phone );
+int arp_clean_cache_req(int arp_phone);
 
 /** Connects to the ARP module.
@@ -114,5 +114,5 @@
  *  @returns 0 if called by the bundle module.
  */
-int	arp_connect_module( services_t service );
+int arp_connect_module(services_t service);
 
 /** Returns the ARP task identifier.
@@ -120,5 +120,5 @@
  *  @returns 0 if called by the remote module.
  */
-task_id_t	arp_task_get_id( void );
+task_id_t arp_task_get_id(void);
 
 /*@}*/
Index: uspace/srv/net/include/byteorder.h
===================================================================
--- uspace/srv/net/include/byteorder.h	(revision 8edacbce0741266516f28901a084219ffd7e4a9f)
+++ uspace/srv/net/include/byteorder.h	(revision aadf01ebd2c032bc8dd43a6e06ae5715e6c2710f)
@@ -42,27 +42,27 @@
 
 
-/** Converts the given short number ( 16 bit ) from the host byte order to the network byte order ( big endian ).
+/** Converts the given short number (16 bit) from the host byte order to the network byte order (big endian).
  *  @param[in] number The number in the host byte order to be converted.
  *  @returns The number in the network byte order.
  */
-#define htons( number )		host2uint16_t_be( number )
+#define htons(number)		host2uint16_t_be(number)
 
-/** Converts the given long number ( 32 bit ) from the host byte order to the network byte order ( big endian ).
+/** Converts the given long number (32 bit) from the host byte order to the network byte order (big endian).
  *  @param[in] number The number in the host byte order to be converted.
  *  @returns The number in the network byte order.
  */
-#define htonl( number )		host2uint32_t_be( number )
+#define htonl(number)		host2uint32_t_be(number)
 
-/** Converts the given short number ( 16 bit ) from the network byte order ( big endian ) to the host byte order.
+/** Converts the given short number (16 bit) from the network byte order (big endian) to the host byte order.
  *  @param[in] number The number in the network byte order to be converted.
  *  @returns The number in the host byte order.
  */
-#define ntohs( number ) 	uint16_t_be2host( number )
+#define ntohs(number) 	uint16_t_be2host(number)
 
-/** Converts the given long number ( 32 bit ) from the network byte order ( big endian ) to the host byte order.
+/** Converts the given long number (32 bit) from the network byte order (big endian) to the host byte order.
  *  @param[in] number The number in the network byte order to be converted.
  *  @returns The number in the host byte order.
  */
-#define ntohl( number )		uint32_t_be2host( number )
+#define ntohl(number)		uint32_t_be2host(number)
 
 #endif
Index: uspace/srv/net/include/checksum.h
===================================================================
--- uspace/srv/net/include/checksum.h	(revision 8edacbce0741266516f28901a084219ffd7e4a9f)
+++ uspace/srv/net/include/checksum.h	(revision aadf01ebd2c032bc8dd43a6e06ae5715e6c2710f)
@@ -54,7 +54,7 @@
  */
 #ifdef ARCH_IS_BIG_ENDIAN
-	#define compute_crc32( seed, data, length )	compute_crc32_be( seed, ( uint8_t * ) data, length )
+	#define compute_crc32(seed, data, length)	compute_crc32_be(seed, (uint8_t *) data, length)
 #else
-	#define compute_crc32( seed, data, length )	compute_crc32_le( seed, ( uint8_t * ) data, length )
+	#define compute_crc32(seed, data, length)	compute_crc32_le(seed, (uint8_t *) data, length)
 #endif
 
@@ -65,5 +65,5 @@
  *  @returns The computed CRC32 of the length bits of the data.
  */
-uint32_t	compute_crc32_le( uint32_t seed, uint8_t * data, size_t length );
+uint32_t compute_crc32_le(uint32_t seed, uint8_t * data, size_t length);
 
 /**	Computes CRC32 value in the big-endian environment.
@@ -73,5 +73,5 @@
  *  @returns The computed CRC32 of the length bits of the data.
  */
-uint32_t	compute_crc32_be( uint32_t seed, uint8_t * data, size_t length );
+uint32_t compute_crc32_be(uint32_t seed, uint8_t * data, size_t length);
 
 /** Computes sum of the 2 byte fields.
@@ -82,5 +82,5 @@
  *  @returns The computed checksum of the length bytes of the data.
  */
-uint32_t	compute_checksum( uint32_t seed, uint8_t * data, size_t length );
+uint32_t compute_checksum(uint32_t seed, uint8_t * data, size_t length);
 
 /** Compacts the computed checksum to the 16 bit number adding the carries.
@@ -88,5 +88,5 @@
  *  @returns Compacted computed checksum to the 16 bits.
  */
-uint16_t	compact_checksum( uint32_t sum );
+uint16_t compact_checksum(uint32_t sum);
 
 /** Returns or flips the checksum if zero.
@@ -95,5 +95,5 @@
  *  @returns 0xFFFF if the computed checksum is zero.
  */
-uint16_t	flip_checksum( uint16_t checksum );
+uint16_t flip_checksum(uint16_t checksum);
 
 /** Computes the ip header checksum.
@@ -106,5 +106,5 @@
  *  @returns 0xFFFF if the computed checksum is zero.
  */
-uint16_t ip_checksum( uint8_t * data, size_t length );
+uint16_t ip_checksum(uint8_t * data, size_t length);
 
 #endif
Index: uspace/srv/net/include/device.h
===================================================================
--- uspace/srv/net/include/device.h	(revision 8edacbce0741266516f28901a084219ffd7e4a9f)
+++ uspace/srv/net/include/device.h	(revision aadf01ebd2c032bc8dd43a6e06ae5715e6c2710f)
@@ -50,5 +50,5 @@
 /** Invalid device identifier.
  */
-#define DEVICE_INVALID_ID		( -1 )
+#define DEVICE_INVALID_ID		(-1)
 
 /** Device identifier type.
@@ -92,77 +92,77 @@
 	/** Total packets received.
 	 */
-	unsigned long	receive_packets;
+	unsigned long receive_packets;
 	/** Total packets transmitted.
 	 */
-	unsigned long	send_packets;
+	unsigned long send_packets;
 	/** Total bytes received.
 	 */
-	unsigned long	receive_bytes;
+	unsigned long receive_bytes;
 	/** Total bytes transmitted.
 	 */
-	unsigned long	send_bytes;
+	unsigned long send_bytes;
 	/** Bad packets received counter.
 	 */
-	unsigned long	receive_errors;
+	unsigned long receive_errors;
 	/** Packet transmition problems counter.
 	 */
-	unsigned long	send_errors;
+	unsigned long send_errors;
 	/** No space in buffers counter.
 	 */
-	unsigned long	receive_dropped;
+	unsigned long receive_dropped;
 	/** No space available counter.
 	 */
-	unsigned long	send_dropped;
+	unsigned long send_dropped;
 	/** Total multicast packets received.
 	 */
-	unsigned long	multicast;
+	unsigned long multicast;
 	/** The number of collisions due to congestion on the medium.
 	 */
-	unsigned long	collisions;
+	unsigned long collisions;
 
 	/* detailed receive_errors: */
 	/** Received packet length error counter.
 	 */
-	unsigned long	receive_length_errors;
+	unsigned long receive_length_errors;
 	/** Receiver buffer overflow counter.
 	 */
-	unsigned long	receive_over_errors;
+	unsigned long receive_over_errors;
 	/** Received packet with crc error counter.
 	 */
-	unsigned long	receive_crc_errors;
+	unsigned long receive_crc_errors;
 	/** Received frame alignment error counter.
 	 */
-	unsigned long	receive_frame_errors;
+	unsigned long receive_frame_errors;
 	/** Receiver fifo overrun counter.
 	 */
-	unsigned long	receive_fifo_errors;
+	unsigned long receive_fifo_errors;
 	/** Receiver missed packet counter.
 	 */
-	unsigned long	receive_missed_errors;
+	unsigned long receive_missed_errors;
 
 	/* detailed send_errors */
 	/** Transmitter aborted counter.
 	 */
-	unsigned long	send_aborted_errors;
+	unsigned long send_aborted_errors;
 	/** Transmitter carrier errors counter.
 	 */
-	unsigned long	send_carrier_errors;
+	unsigned long send_carrier_errors;
 	/** Transmitter fifo overrun counter.
 	 */
-	unsigned long	send_fifo_errors;
+	unsigned long send_fifo_errors;
 	/** Transmitter carrier errors counter.
 	 */
-	unsigned long	send_heartbeat_errors;
+	unsigned long send_heartbeat_errors;
 	/** Transmitter window errors counter.
 	 */
-	unsigned long	send_window_errors;
+	unsigned long send_window_errors;
 
 	/* for cslip etc */
 	/** Total compressed packets received.
 	 */
-	unsigned long	receive_compressed;
+	unsigned long receive_compressed;
 	/** Total compressed packet transmitted.
 	 */
-	unsigned long	send_compressed;
+	unsigned long send_compressed;
 };
 
Index: uspace/srv/net/include/ethernet_lsap.h
===================================================================
--- uspace/srv/net/include/ethernet_lsap.h	(revision 8edacbce0741266516f28901a084219ffd7e4a9f)
+++ uspace/srv/net/include/ethernet_lsap.h	(revision aadf01ebd2c032bc8dd43a6e06ae5715e6c2710f)
@@ -72,5 +72,5 @@
  */
 #define ETH_LSAP_SNA2	0x0C
-/** PROWAY (IEC955) Network Management & Initialization LSAP identifier.
+/** PROWAY (IEC955) Network Management &Initialization LSAP identifier.
  */
 #define ETH_LSAP_PROWAY_NMI	0x0E
Index: uspace/srv/net/include/ethernet_protocols.h
===================================================================
--- uspace/srv/net/include/ethernet_protocols.h	(revision 8edacbce0741266516f28901a084219ffd7e4a9f)
+++ uspace/srv/net/include/ethernet_protocols.h	(revision aadf01ebd2c032bc8dd43a6e06ae5715e6c2710f)
@@ -373,5 +373,5 @@
 #define ETH_P_Stanford_V_Kernel_prod		0x805C
 
-/** Evans & Sutherland ethernet protocol type.
+/** Evans &Sutherland ethernet protocol type.
  */
 #define ETH_P_Evans_Sutherland		0x805D
@@ -873,9 +873,9 @@
 #define ETH_P_Taurus_Controls_MAX		0x82AB
 
-/** Walker Richer & Quinn ethernet protocol type.
+/** Walker Richer &Quinn ethernet protocol type.
  */
 #define ETH_P_Walker_Richer_Quinn_MIN		0x82AC
 
-/** Walker Richer & Quinn ethernet protocol type.
+/** Walker Richer &Quinn ethernet protocol type.
  */
 #define ETH_P_Walker_Richer_Quinn_MAX		0x8693
@@ -921,9 +921,9 @@
 #define ETH_P_ATOMIC		0x86DF
 
-/** Landis & Gyr Powers ethernet protocol type.
+/** Landis &Gyr Powers ethernet protocol type.
  */
 #define ETH_P_Landis_Gyr_Powers_MIN		0x86E0
 
-/** Landis & Gyr Powers ethernet protocol type.
+/** Landis &Gyr Powers ethernet protocol type.
  */
 #define ETH_P_Landis_Gyr_Powers_MAX		0x86EF
Index: uspace/srv/net/include/icmp_api.h
===================================================================
--- uspace/srv/net/include/icmp_api.h	(revision 8edacbce0741266516f28901a084219ffd7e4a9f)
+++ uspace/srv/net/include/icmp_api.h	(revision aadf01ebd2c032bc8dd43a6e06ae5715e6c2710f)
@@ -79,5 +79,5 @@
  *  @returns EPARTY if there was an internal error.
  */
-int	icmp_echo_msg( int icmp_phone, size_t size, mseconds_t timeout, ip_ttl_t ttl, ip_tos_t tos, int dont_fragment, const struct sockaddr * addr, socklen_t addrlen );
+int icmp_echo_msg(int icmp_phone, size_t size, mseconds_t timeout, ip_ttl_t ttl, ip_tos_t tos, int dont_fragment, const struct sockaddr * addr, socklen_t addrlen);
 
 /*@}*/
Index: uspace/srv/net/include/icmp_client.h
===================================================================
--- uspace/srv/net/include/icmp_client.h	(revision 8edacbce0741266516f28901a084219ffd7e4a9f)
+++ uspace/srv/net/include/icmp_client.h	(revision aadf01ebd2c032bc8dd43a6e06ae5715e6c2710f)
@@ -50,5 +50,5 @@
  *  @returns Zero (0) if the packet contains no data.
  */
-int	icmp_client_process_packet( packet_t packet, icmp_type_t * type, icmp_code_t * code, icmp_param_t * pointer, icmp_param_t * mtu );
+int icmp_client_process_packet(packet_t packet, icmp_type_t * type, icmp_code_t * code, icmp_param_t * pointer, icmp_param_t * mtu);
 
 /** Returns the ICMP header length.
@@ -56,5 +56,5 @@
  *  @returns The ICMP header length in bytes.
  */
-size_t	icmp_client_header_length( packet_t packet );
+size_t icmp_client_header_length(packet_t packet);
 
 #endif
Index: uspace/srv/net/include/icmp_common.h
===================================================================
--- uspace/srv/net/include/icmp_common.h	(revision 8edacbce0741266516f28901a084219ffd7e4a9f)
+++ uspace/srv/net/include/icmp_common.h	(revision aadf01ebd2c032bc8dd43a6e06ae5715e6c2710f)
@@ -44,5 +44,5 @@
 /** Default timeout for incoming connections in microseconds.
  */
-#define ICMP_CONNECT_TIMEOUT	( 1 * 1000 * 1000 )
+#define ICMP_CONNECT_TIMEOUT	(1 * 1000 * 1000)
 
 /** Connects to the ICMP module.
@@ -53,5 +53,5 @@
  *  @returns ETIMEOUT if the connection timeouted.
  */
-int	icmp_connect_module( services_t service, suseconds_t timeout );
+int icmp_connect_module(services_t service, suseconds_t timeout);
 
 #endif
Index: uspace/srv/net/include/icmp_interface.h
===================================================================
--- uspace/srv/net/include/icmp_interface.h	(revision 8edacbce0741266516f28901a084219ffd7e4a9f)
+++ uspace/srv/net/include/icmp_interface.h	(revision aadf01ebd2c032bc8dd43a6e06ae5715e6c2710f)
@@ -71,5 +71,5 @@
  *  @returns ENOMEM if there is not enough memory left.
  */
-int icmp_destination_unreachable_msg( int icmp_phone, icmp_code_t code, icmp_param_t mtu, packet_t packet );
+int icmp_destination_unreachable_msg(int icmp_phone, icmp_code_t code, icmp_param_t mtu, packet_t packet);
 
 /** Sends the Source Quench error notification packet.
@@ -82,5 +82,5 @@
  *  @returns ENOMEM if there is not enough memory left.
  */
-int icmp_source_quench_msg( int icmp_phone, packet_t packet );
+int icmp_source_quench_msg(int icmp_phone, packet_t packet);
 
 /** Sends the Time Exceeded error notification packet.
@@ -94,5 +94,5 @@
  *  @returns ENOMEM if there is not enough memory left.
  */
-int icmp_time_exceeded_msg( int icmp_phone, icmp_code_t code, packet_t packet );
+int icmp_time_exceeded_msg(int icmp_phone, icmp_code_t code, packet_t packet);
 
 /** Sends the Parameter Problem error notification packet.
@@ -107,5 +107,5 @@
  *  @returns ENOMEM if there is not enough memory left.
  */
-int icmp_parameter_problem_msg( int icmp_phone, icmp_code_t code, icmp_param_t pointer, packet_t packet );
+int icmp_parameter_problem_msg(int icmp_phone, icmp_code_t code, icmp_param_t pointer, packet_t packet);
 
 /*@}*/
Index: uspace/srv/net/include/il_interface.h
===================================================================
--- uspace/srv/net/include/il_interface.h	(revision 8edacbce0741266516f28901a084219ffd7e4a9f)
+++ uspace/srv/net/include/il_interface.h	(revision aadf01ebd2c032bc8dd43a6e06ae5715e6c2710f)
@@ -64,6 +64,6 @@
  *  @returns EOK on success.
  */
-static inline int	il_device_state_msg( int il_phone, device_id_t device_id, device_state_t state, services_t target ){
-	return generic_device_state_msg( il_phone, NET_IL_DEVICE_STATE, device_id, state, target );
+static inline int il_device_state_msg(int il_phone, device_id_t device_id, device_state_t state, services_t target){
+	return generic_device_state_msg(il_phone, NET_IL_DEVICE_STATE, device_id, state, target);
 }
 
@@ -75,6 +75,6 @@
  *  @returns EOK on success.
  */
-inline static int	il_received_msg( int il_phone, device_id_t device_id, packet_t packet, services_t target ){
-	return generic_received_msg( il_phone, NET_IL_RECEIVED, device_id, packet_get_id( packet ), target, 0 );
+inline static int il_received_msg(int il_phone, device_id_t device_id, packet_t packet, services_t target){
+	return generic_received_msg(il_phone, NET_IL_RECEIVED, device_id, packet_get_id(packet), target, 0);
 }
 
@@ -86,6 +86,6 @@
  *  @returns EOK on success.
  */
-inline static int	il_mtu_changed_msg( int il_phone, device_id_t device_id, size_t mtu, services_t target ){
-	return generic_device_state_msg( il_phone, NET_IL_MTU_CHANGED, device_id, ( int ) mtu, target );
+inline static int il_mtu_changed_msg(int il_phone, device_id_t device_id, size_t mtu, services_t target){
+	return generic_device_state_msg(il_phone, NET_IL_MTU_CHANGED, device_id, (int) mtu, target);
 }
 
Index: uspace/srv/net/include/in.h
===================================================================
--- uspace/srv/net/include/in.h	(revision 8edacbce0741266516f28901a084219ffd7e4a9f)
+++ uspace/srv/net/include/in.h	(revision aadf01ebd2c032bc8dd43a6e06ae5715e6c2710f)
@@ -45,5 +45,5 @@
 /** INET string address maximum length.
  */
-#define INET_ADDRSTRLEN		( 4 * 3 + 3 + 1 )
+#define INET_ADDRSTRLEN		(4 * 3 + 3 + 1)
 
 /** Type definition of the INET address.
@@ -62,5 +62,5 @@
 	/** 4 byte IP address.
 	 */
-	uint32_t		s_addr;
+	uint32_t s_addr;
 };
 
@@ -72,14 +72,14 @@
 	 *  Should be AF_INET.
 	 */
-	uint16_t		sin_family;
+	uint16_t sin_family;
 	/** Port number.
 	 */
-	uint16_t		sin_port;
+	uint16_t sin_port;
 	/** Internet address.
 	 */
-	struct in_addr	sin_addr;
+	struct in_addr sin_addr;
 	/** Padding to meet the sockaddr size.
 	 */
-	uint8_t			sin_zero[ 8 ];
+	uint8_t sin_zero[8];
 };
 
Index: uspace/srv/net/include/in6.h
===================================================================
--- uspace/srv/net/include/in6.h	(revision 8edacbce0741266516f28901a084219ffd7e4a9f)
+++ uspace/srv/net/include/in6.h	(revision aadf01ebd2c032bc8dd43a6e06ae5715e6c2710f)
@@ -45,5 +45,5 @@
 /** INET6 string address maximum length.
  */
-#define INET6_ADDRSTRLEN	( 8 * 4 + 7 + 1 )
+#define INET6_ADDRSTRLEN	(8 * 4 + 7 + 1)
 
 /** Type definition of the INET6 address.
@@ -62,5 +62,5 @@
 	/** 16 byte IPv6 address.
 	 */
-	unsigned char	s6_addr[ 16 ];
+	unsigned char s6_addr[16];
 };
 
@@ -72,17 +72,17 @@
 	 *  Should be AF_INET6.
 	 */
-	uint16_t		sin6_family;
+	uint16_t sin6_family;
 	/** Port number.
 	 */
-	uint16_t		sin6_port;
+	uint16_t sin6_port;
 	/** IPv6 flow information.
 	 */
-	uint32_t		sin6_flowinfo;
+	uint32_t sin6_flowinfo;
 	/** IPv6 address.
 	 */
-	struct in6_addr	sin6_addr;
+	struct in6_addr sin6_addr;
 	/** Scope identifier.
 	 */
-	uint32_t		sin6_scope_id;
+	uint32_t sin6_scope_id;
 };
 
Index: uspace/srv/net/include/inet.h
===================================================================
--- uspace/srv/net/include/inet.h	(revision 8edacbce0741266516f28901a084219ffd7e4a9f)
+++ uspace/srv/net/include/inet.h	(revision aadf01ebd2c032bc8dd43a6e06ae5715e6c2710f)
@@ -62,5 +62,5 @@
  *  @returns ENOTSUP if the address family is not supported.
  */
-int	inet_ntop( uint16_t family, const uint8_t * data, char * address, size_t length );
+int inet_ntop(uint16_t family, const uint8_t * data, char * address, size_t length);
 
 /** Parses the character string into the address.
@@ -74,5 +74,5 @@
  *  @returns ENOTSUP if the address family is not supported.
  */
-int	inet_pton( uint16_t family, const char * address, uint8_t * data );
+int inet_pton(uint16_t family, const char * address, uint8_t * data);
 
 /** Socket address.
@@ -82,8 +82,8 @@
 	 *  @see socket.h
 	 */
-	uint16_t		sa_family;
+	uint16_t sa_family;
 	/** 14 byte protocol address.
 	 */
-	uint8_t			sa_data[ 14 ];
+	uint8_t sa_data[14];
 };
 
Index: uspace/srv/net/include/ip_client.h
===================================================================
--- uspace/srv/net/include/ip_client.h	(revision 8edacbce0741266516f28901a084219ffd7e4a9f)
+++ uspace/srv/net/include/ip_client.h	(revision aadf01ebd2c032bc8dd43a6e06ae5715e6c2710f)
@@ -57,5 +57,5 @@
  *  @returns ENOMEM if there is not enough memory left in the packet.
  */
-int	ip_client_prepare_packet( packet_t packet, ip_protocol_t protocol, ip_ttl_t ttl, ip_tos_t tos, int dont_fragment, size_t ipopt_length );
+int ip_client_prepare_packet(packet_t packet, ip_protocol_t protocol, ip_ttl_t ttl, ip_tos_t tos, int dont_fragment, size_t ipopt_length);
 
 /** Processes the received IP packet.
@@ -71,5 +71,5 @@
  *  @returns ENOMEM if the packet is too short to contain the IP header.
  */
-int	ip_client_process_packet( packet_t packet, ip_protocol_t * protocol, ip_ttl_t * ttl, ip_tos_t * tos, int * dont_fragment, size_t * ipopt_length );
+int ip_client_process_packet(packet_t packet, ip_protocol_t * protocol, ip_ttl_t * ttl, ip_tos_t * tos, int * dont_fragment, size_t * ipopt_length);
 
 /** Returns the IP header length.
@@ -78,5 +78,5 @@
  *  @returns Zero (0) if there is no IP header.
  */
-size_t	ip_client_header_length( packet_t packet );
+size_t ip_client_header_length(packet_t packet);
 
 /** Updates the IPv4 pseudo header data length field.
@@ -88,5 +88,5 @@
  *  @returns EINVAL if the headerlen parameter is not IPv4 pseudo header length.
  */
-int	ip_client_set_pseudo_header_data_length( ip_pseudo_header_ref header, size_t headerlen, size_t data_length );
+int ip_client_set_pseudo_header_data_length(ip_pseudo_header_ref header, size_t headerlen, size_t data_length);
 
 /** Constructs the IPv4 pseudo header.
@@ -108,5 +108,5 @@
  *  @returns ENOMEM if there is not enough memory left.
  */
-int	ip_client_get_pseudo_header( ip_protocol_t protocol, struct sockaddr * src, socklen_t srclen, struct sockaddr * dest, socklen_t destlen, size_t data_length, ip_pseudo_header_ref * header, size_t * headerlen );
+int ip_client_get_pseudo_header(ip_protocol_t protocol, struct sockaddr * src, socklen_t srclen, struct sockaddr * dest, socklen_t destlen, size_t data_length, ip_pseudo_header_ref * header, size_t * headerlen);
 
 // TODO ipopt manipulation
Index: uspace/srv/net/include/ip_codes.h
===================================================================
--- uspace/srv/net/include/ip_codes.h	(revision 8edacbce0741266516f28901a084219ffd7e4a9f)
+++ uspace/srv/net/include/ip_codes.h	(revision aadf01ebd2c032bc8dd43a6e06ae5715e6c2710f)
@@ -94,33 +94,33 @@
 /** Normal delay.
  */
-#define IPTOS_NORMALDELAY			( 0x0 << IPTOS_DELAY_SHIFT )
+#define IPTOS_NORMALDELAY			(0x0 << IPTOS_DELAY_SHIFT)
 
 /** Low delay.
  */
-#define IPTOS_LOWDELAY				( 0x1 << IPTOS_DELAY_SHIFT )
+#define IPTOS_LOWDELAY				(0x1 << IPTOS_DELAY_SHIFT)
 
 /** Normal throughput.
  */
-#define IPTOS_NORMALTHROUGHPUT		( 0x0 << IPTOS_THROUGHPUT_SHIFT )
+#define IPTOS_NORMALTHROUGHPUT		(0x0 << IPTOS_THROUGHPUT_SHIFT)
 
 /** Throughput.
  */
-#define IPTOS_THROUGHPUT			( 0x1 << IPTOS_THROUGHPUT_SHIFT )
+#define IPTOS_THROUGHPUT			(0x1 << IPTOS_THROUGHPUT_SHIFT)
 
 /** Normal reliability.
  */
-#define IPTOS_NORMALRELIABILITY		( 0x0 << IPTOS_RELIABILITY_SHIFT )
+#define IPTOS_NORMALRELIABILITY		(0x0 << IPTOS_RELIABILITY_SHIFT)
 
 /** Reliability.
  */
-#define IPTOS_RELIABILITY			( 0x1 << IPTOS_RELIABILITY_SHIFT )
+#define IPTOS_RELIABILITY			(0x1 << IPTOS_RELIABILITY_SHIFT)
 
 /** Normal cost.
  */
-#define IPTOS_NORMALCOST			( 0x0 << IPTOS_COST_SHIFT )
+#define IPTOS_NORMALCOST			(0x0 << IPTOS_COST_SHIFT)
 
 /** Minimum cost.
  */
-#define IPTOS_MICNCOST				( 0x1 << IPTOS_COST_SHIFT )
+#define IPTOS_MICNCOST				(0x1 << IPTOS_COST_SHIFT)
 
 /*@}*/
@@ -137,33 +137,33 @@
 /** Routine precedence.
  */
-#define IPTOS_PREC_ROUTINE			( 0x0 << IPTOS_PRECEDENCE_SHIFT )
+#define IPTOS_PREC_ROUTINE			(0x0 << IPTOS_PRECEDENCE_SHIFT)
 
 /** Priority precedence.
  */
-#define IPTOS_PREC_PRIORITY			( 0x1 << IPTOS_PRECEDENCE_SHIFT )
+#define IPTOS_PREC_PRIORITY			(0x1 << IPTOS_PRECEDENCE_SHIFT)
 
 /** Immediate precedence.
  */
-#define IPTOS_PREC_IMMEDIATE		( 0x2 << IPTOS_PRECEDENCE_SHIFT )
+#define IPTOS_PREC_IMMEDIATE		(0x2 << IPTOS_PRECEDENCE_SHIFT)
 
 /** Flash precedence.
  */
-#define IPTOS_PREC_FLASH			( 0x3 << IPTOS_PRECEDENCE_SHIFT )
+#define IPTOS_PREC_FLASH			(0x3 << IPTOS_PRECEDENCE_SHIFT)
 
 /** Flash override precedence.
  */
-#define IPTOS_PREC_FLASHOVERRIDE	( 0x4 << IPTOS_PRECEDENCE_SHIFT )
+#define IPTOS_PREC_FLASHOVERRIDE	(0x4 << IPTOS_PRECEDENCE_SHIFT)
 
 /** Critical precedence.
  */
-#define IPTOS_PREC_CRITIC_ECP		( 0x5 << IPTOS_PRECEDENCE_SHIFT )
+#define IPTOS_PREC_CRITIC_ECP		(0x5 << IPTOS_PRECEDENCE_SHIFT)
 
 /** Inter-network control precedence.
  */
-#define IPTOS_PREC_INTERNETCONTROL	( 0x6 << IPTOS_PRECEDENCE_SHIFT )
+#define IPTOS_PREC_INTERNETCONTROL	(0x6 << IPTOS_PRECEDENCE_SHIFT)
 
 /** Network control precedence.
  */
-#define IPTOS_PREC_NETCONTROL		( 0x7 << IPTOS_PRECEDENCE_SHIFT )
+#define IPTOS_PREC_NETCONTROL		(0x7 << IPTOS_PRECEDENCE_SHIFT)
 
 /*@}*/
@@ -195,5 +195,5 @@
 /** Copy flag.
  */
-#define IPOPT_COPY					( 1 << IPOPT_COPY_SHIFT )
+#define IPOPT_COPY					(1 << IPOPT_COPY_SHIFT)
 
 /** Returns IP option type.
@@ -202,20 +202,20 @@
  *  @param[in] number The IP option number.
  */
-#define IPOPT_TYPE( copy, class, number )	((( copy ) & IPOPT_COPY ) | (( class ) & IPOPT_CLASS_MASK ) | (( number << IPOPT_NUMBER_SHIFT ) & IPOPT_NUMBER_MASK ))
+#define IPOPT_TYPE(copy, class, number)	(((copy) &IPOPT_COPY) | ((class) &IPOPT_CLASS_MASK) | ((number << IPOPT_NUMBER_SHIFT) &IPOPT_NUMBER_MASK))
 
 /** Returns a value indicating whether the IP option should be copied.
  *  @param[in] o The IP option.
  */
-#define	IPOPT_COPIED( o )			(( o ) & IPOPT_COPY )
+#define	IPOPT_COPIED(o)			((o) &IPOPT_COPY)
 
 /** Returns an IP option class.
  *  @param[in] o The IP option.
  */
-#define	IPOPT_CLASS( o )			(( o ) & IPOPT_CLASS_MASK )
+#define	IPOPT_CLASS(o)			((o) &IPOPT_CLASS_MASK)
 
 /** Returns an IP option number.
  *  @param[in] o The IP option.
  */
-#define	IPOPT_NUMBER( o )			(( o ) & IPOPT_NUMBER_MASK )
+#define	IPOPT_NUMBER(o)			((o) &IPOPT_NUMBER_MASK)
 
 /*@}*/
@@ -227,17 +227,17 @@
 /** Control class.
  */
-#define	IPOPT_CONTROL				( 0 << IPOPT_CLASS_SHIFT )
+#define	IPOPT_CONTROL				(0 << IPOPT_CLASS_SHIFT)
 
 /** Reserved class 1.
  */
-#define	IPOPT_RESERVED1				( 1 << IPOPT_CLASS_SHIFT )
+#define	IPOPT_RESERVED1				(1 << IPOPT_CLASS_SHIFT)
 
 /** Measurement class.
  */
-#define	IPOPT_MEASUREMENT			( 2 << IPOPT_CLASS_SHIFT )
+#define	IPOPT_MEASUREMENT			(2 << IPOPT_CLASS_SHIFT)
 
 /** Reserved class 2.
  */
-#define	IPOPT_RESERVED2				( 3 << IPOPT_CLASS_SHIFT )
+#define	IPOPT_RESERVED2				(3 << IPOPT_CLASS_SHIFT)
 
 /*@}*/
@@ -250,35 +250,35 @@
  */
 //#define IPOPT_END_OF_LIST			0x0
-#define IPOPT_END					IPOPT_TYPE( 0, IPOPT_CONTROL, 0 )
+#define IPOPT_END					IPOPT_TYPE(0, IPOPT_CONTROL, 0)
 
 /** No operation.
  */
 //#define IPOPT_NO_OPERATION		0x1
-#define IPOPT_NOOP					IPOPT_TYPE( 0, IPOPT_CONTROL, 1 )
+#define IPOPT_NOOP					IPOPT_TYPE(0, IPOPT_CONTROL, 1)
 
 /** Security.
  */
 //#define IPOPT_SECURITY			0x82
-#define IPOPT_SEC					IPOPT_TYPE( IPOPT_COPY, IPOPT_CONTROL, 2 )
+#define IPOPT_SEC					IPOPT_TYPE(IPOPT_COPY, IPOPT_CONTROL, 2)
 
 /** Loose source.
  */
 //#define IPOPT_LOOSE_SOURCE		0x83
-#define IPOPT_LSRR					IPOPT_TYPE( IPOPT_COPY, IPOPT_CONTROL, 3 )
+#define IPOPT_LSRR					IPOPT_TYPE(IPOPT_COPY, IPOPT_CONTROL, 3)
 
 /** Strict route.
  */
 //#define IPOPT_STRICT_SOURCE		0x89
-#define IPOPT_SSRR					IPOPT_TYPE( IPOPT_COPY, IPOPT_CONTROL, 9 )
+#define IPOPT_SSRR					IPOPT_TYPE(IPOPT_COPY, IPOPT_CONTROL, 9)
 
 /** Record route.
  */
 //#define IPOPT_RECORD_ROUTE		0x07
-#define IPOPT_RR					IPOPT_TYPE( IPOPT_COPY, IPOPT_CONTROL, 7 )
+#define IPOPT_RR					IPOPT_TYPE(IPOPT_COPY, IPOPT_CONTROL, 7)
 
 /** Stream identifier.
  */
 //#define IPOPT_STREAM_IDENTIFIER	0x88
-#define IPOPT_SID					IPOPT_TYPE( IPOPT_COPY, IPOPT_CONTROL, 8 )
+#define IPOPT_SID					IPOPT_TYPE(IPOPT_COPY, IPOPT_CONTROL, 8)
 
 /** Stream identifier length.
@@ -289,9 +289,9 @@
  */
 //#define IPOPT_INTERNET_TIMESTAMP	0x44
-#define IPOPT_TIMESTAMP				IPOPT_TYPE( IPOPT_COPY, IPOPT_MEASUREMENT, 4 )
+#define IPOPT_TIMESTAMP				IPOPT_TYPE(IPOPT_COPY, IPOPT_MEASUREMENT, 4)
 
 /** Commercial IP security option.
  */
-#define IPOPT_CIPSO					IPOPT_TYPE( IPOPT_COPY, IPOPT_CONTROL, 5 )
+#define IPOPT_CIPSO					IPOPT_TYPE(IPOPT_COPY, IPOPT_CONTROL, 5)
 
 /** No operation variant.
Index: uspace/srv/net/include/ip_interface.h
===================================================================
--- uspace/srv/net/include/ip_interface.h	(revision 8edacbce0741266516f28901a084219ffd7e4a9f)
+++ uspace/srv/net/include/ip_interface.h	(revision aadf01ebd2c032bc8dd43a6e06ae5715e6c2710f)
@@ -70,5 +70,5 @@
  *  @returns EOK on success.
  */
-typedef int	( * tl_received_msg_t )( device_id_t device_id, packet_t packet, services_t receiver, services_t error );
+typedef int	(*tl_received_msg_t)(device_id_t device_id, packet_t packet, services_t receiver, services_t error);
 
 /** Creates bidirectional connection with the ip module service and registers the message receiver.
@@ -82,5 +82,5 @@
  *  @returns Other error codes as defined for the bind_service() function.
  */
-int	ip_bind_service( services_t service, int protocol, services_t me, async_client_conn_t receiver, tl_received_msg_t tl_received_msg );
+int ip_bind_service(services_t service, int protocol, services_t me, async_client_conn_t receiver, tl_received_msg_t tl_received_msg);
 
 /** Registers the new device.
@@ -98,5 +98,5 @@
  *  @returns Other error codes as defined for the arp_device_req() function.
  */
-int	ip_device_req( int ip_phone, device_id_t device_id, services_t netif );
+int ip_device_req(int ip_phone, device_id_t device_id, services_t netif);
 
 /** Sends the packet queue.
@@ -110,5 +110,5 @@
  *  @returns Other error codes as defined for the generic_send_msg() function.
  */
-int	ip_send_msg( int ip_phone, device_id_t device_id, packet_t packet, services_t sender, services_t error );
+int ip_send_msg(int ip_phone, device_id_t device_id, packet_t packet, services_t sender, services_t error);
 
 /** Connects to the IP module.
@@ -117,5 +117,5 @@
  *  @returns 0 if called by the bundle module.
  */
-int	ip_connect_module( services_t service );
+int ip_connect_module(services_t service);
 
 /** Adds a route to the device routing table.
@@ -127,5 +127,5 @@
  *  @param[in] gateway The target network gateway. Not used if zero.
  */
-int	ip_add_route_req( int ip_phone, device_id_t device_id, in_addr_t address, in_addr_t netmask, in_addr_t gateway );
+int ip_add_route_req(int ip_phone, device_id_t device_id, in_addr_t address, in_addr_t netmask, in_addr_t gateway);
 
 /** Sets the default gateway.
@@ -135,5 +135,5 @@
  *  @param[in] gateway The default gateway.
  */
-int	ip_set_gateway_req( int ip_phone, device_id_t device_id, in_addr_t gateway );
+int ip_set_gateway_req(int ip_phone, device_id_t device_id, in_addr_t gateway);
 
 /** Returns the device packet dimension for sending.
@@ -145,5 +145,5 @@
  *  @returns Other error codes as defined for the generic_packet_size_req() function.
  */
-int	ip_packet_size_req( int ip_phone, device_id_t device_id, packet_dimension_ref packet_dimension );
+int ip_packet_size_req(int ip_phone, device_id_t device_id, packet_dimension_ref packet_dimension);
 
 /** Notifies the IP module about the received error notification packet.
@@ -155,5 +155,5 @@
  *  @returns EOK on success.
  */
-int	ip_received_error_msg( int ip_phone, device_id_t device_id, packet_t packet, services_t target, services_t error );
+int ip_received_error_msg(int ip_phone, device_id_t device_id, packet_t packet, services_t target, services_t error);
 
 /** Returns the device identifier and the IP pseudo header based on the destination address.
@@ -166,5 +166,5 @@
  *  @param[out] headerlen The IP pseudo header length.
  */
-int	ip_get_route_req( int ip_phone, ip_protocol_t protocol, const struct sockaddr * destination, socklen_t addrlen, device_id_t * device_id, ip_pseudo_header_ref * header, size_t * headerlen );
+int ip_get_route_req(int ip_phone, ip_protocol_t protocol, const struct sockaddr * destination, socklen_t addrlen, device_id_t * device_id, ip_pseudo_header_ref * header, size_t * headerlen);
 
 /*@}*/
Index: uspace/srv/net/include/ip_protocols.h
===================================================================
--- uspace/srv/net/include/ip_protocols.h	(revision 8edacbce0741266516f28901a084219ffd7e4a9f)
+++ uspace/srv/net/include/ip_protocols.h	(revision aadf01ebd2c032bc8dd43a6e06ae5715e6c2710f)
@@ -610,5 +610,5 @@
 /** Maximum internet protocol number.
  */
-#define IPPROTO_MAX		( IPPROTO_RAW + 1 )
+#define IPPROTO_MAX		(IPPROTO_RAW + 1)
 
 /*@}*/
Index: uspace/srv/net/include/net_interface.h
===================================================================
--- uspace/srv/net/include/net_interface.h	(revision 8edacbce0741266516f28901a084219ffd7e4a9f)
+++ uspace/srv/net/include/net_interface.h	(revision aadf01ebd2c032bc8dd43a6e06ae5715e6c2710f)
@@ -66,5 +66,5 @@
  *  @returns Other error codes as defined for the generic_translate_req() function.
  */
-int	net_get_device_conf_req( int net_phone, device_id_t device_id, measured_string_ref * configuration, size_t count, char ** data );
+int net_get_device_conf_req(int net_phone, device_id_t device_id, measured_string_ref * configuration, size_t count, char ** data);
 
 /** Returns the global configuration.
@@ -80,5 +80,5 @@
  *  @returns Other error codes as defined for the generic_translate_req() function.
  */
-int	net_get_conf_req( int net_phone, measured_string_ref * configuration, size_t count, char ** data );
+int net_get_conf_req(int net_phone, measured_string_ref * configuration, size_t count, char ** data);
 
 /** Frees the received settings.
@@ -88,5 +88,5 @@
  *  @see net_get_conf_req()
  */
-void	net_free_settings( measured_string_ref settings, char * data );
+void net_free_settings(measured_string_ref settings, char * data);
 
 /** Connects to the networking module.
@@ -95,5 +95,5 @@
  *  @returns 0 if called by the bundle module.
  */
-int	net_connect_module( services_t service );
+int net_connect_module(services_t service);
 
 /*@}*/
Index: uspace/srv/net/include/netdb.h
===================================================================
--- uspace/srv/net/include/netdb.h	(revision 8edacbce0741266516f28901a084219ffd7e4a9f)
+++ uspace/srv/net/include/netdb.h	(revision aadf01ebd2c032bc8dd43a6e06ae5715e6c2710f)
@@ -46,5 +46,5 @@
 	/** Official host name.
 	 */
-	char *	h_name;
+	char * h_name;
 	/** Alias list.
 	 */
@@ -52,8 +52,8 @@
 	/** Host address type.
 	 */
-	int		h_addrtype;
+	int h_addrtype;
 	/** Address length.
 	 */
-	int		h_length;
+	int h_length;
 	/** List of addresses from name server.
 	 */
@@ -61,5 +61,5 @@
 	/** Address, for backward compatiblity.
 	 */
-#define	h_addr	h_addr_list[ 0 ]
+#define	h_addr	h_addr_list[0]
 };
 
@@ -96,5 +96,5 @@
  *  @returns Host entry information.
  */
-//struct hostent *	gethostbyaddr( const void * address, int len, int type );
+//struct hostent *	gethostbyaddr(const void * address, int len, int type);
 
 /** Returns host entry by the host name.
@@ -102,5 +102,5 @@
  *  @returns Host entry information.
  */
-//struct hostent *	gethostbyname( const char * name );
+//struct hostent *	gethostbyname(const char * name);
 
 #endif
Index: uspace/srv/net/include/netif_interface.h
===================================================================
--- uspace/srv/net/include/netif_interface.h	(revision 8edacbce0741266516f28901a084219ffd7e4a9f)
+++ uspace/srv/net/include/netif_interface.h	(revision aadf01ebd2c032bc8dd43a6e06ae5715e6c2710f)
@@ -65,5 +65,5 @@
  *  @returns Other error codes as defined for the netif_get_addr_message() function.
  */
-int	netif_get_addr_req( int netif_phone, device_id_t device_id, measured_string_ref * address, char ** data );
+int netif_get_addr_req(int netif_phone, device_id_t device_id, measured_string_ref * address, char ** data);
 
 /** Probes the existence of the device.
@@ -75,5 +75,5 @@
  *  @returns Other errro codes as defined for the netif_probe_message().
  */
-int	netif_probe_req( int netif_phone, device_id_t device_id, int irq, int io );
+int netif_probe_req(int netif_phone, device_id_t device_id, int irq, int io);
 
 /** Sends the packet queue.
@@ -85,5 +85,5 @@
  *  @returns Other error codes as defined for the generic_send_msg() function.
  */
-int	netif_send_msg( int netif_phone, device_id_t device_id, packet_t packet, services_t sender );
+int netif_send_msg(int netif_phone, device_id_t device_id, packet_t packet, services_t sender);
 
 /** Starts the device.
@@ -94,5 +94,5 @@
  *  @returns Other error codes as defined for the netif_start_message() function.
  */
-int	netif_start_req( int netif_phone, device_id_t device_id );
+int netif_start_req(int netif_phone, device_id_t device_id);
 
 /** Stops the device.
@@ -103,5 +103,5 @@
  *  @returns Other error codes as defined for the netif_stop_message() function.
  */
-int	netif_stop_req( int netif_phone, device_id_t device_id );
+int netif_stop_req(int netif_phone, device_id_t device_id);
 
 /** Returns the device usage statistics.
@@ -111,5 +111,5 @@
  *  @returns EOK on success.
  */
-int	netif_stats_req( int netif_phone, device_id_t device_id, device_stats_ref stats );
+int netif_stats_req(int netif_phone, device_id_t device_id, device_stats_ref stats);
 
 /** Creates bidirectional connection with the network interface module and registers the message receiver.
@@ -122,5 +122,5 @@
  *  @returns Other error codes as defined for the bind_service() function.
  */
-int	netif_bind_service( services_t service, device_id_t device_id, services_t me, async_client_conn_t receiver );
+int netif_bind_service(services_t service, device_id_t device_id, services_t me, async_client_conn_t receiver);
 
 /*@}*/
Index: uspace/srv/net/include/nil_interface.h
===================================================================
--- uspace/srv/net/include/nil_interface.h	(revision 8edacbce0741266516f28901a084219ffd7e4a9f)
+++ uspace/srv/net/include/nil_interface.h	(revision aadf01ebd2c032bc8dd43a6e06ae5715e6c2710f)
@@ -71,6 +71,6 @@
  *  @returns Other error codes as defined for the generic_get_addr_req() function.
  */
-#define nil_get_addr_req( nil_phone, device_id, address, data )	\
-	generic_get_addr_req( nil_phone, NET_NIL_ADDR, device_id, address, data )
+#define nil_get_addr_req(nil_phone, device_id, address, data)	\
+	generic_get_addr_req(nil_phone, NET_NIL_ADDR, device_id, address, data)
 
 /** Returns the device broadcast hardware address.
@@ -84,6 +84,6 @@
  *  @returns Other error codes as defined for the generic_get_addr_req() function.
  */
-#define nil_get_broadcast_addr_req( nil_phone, device_id, address, data )	\
-	generic_get_addr_req( nil_phone, NET_NIL_BROADCAST_ADDR, device_id, address, data )
+#define nil_get_broadcast_addr_req(nil_phone, device_id, address, data)	\
+	generic_get_addr_req(nil_phone, NET_NIL_BROADCAST_ADDR, device_id, address, data)
 
 /** Sends the packet queue.
@@ -95,6 +95,6 @@
  *  @returns Other error codes as defined for the generic_send_msg() function.
  */
-#define nil_send_msg( nil_phone, device_id, packet, sender )	\
-	generic_send_msg( nil_phone, NET_NIL_SEND, device_id, packet_get_id( packet ), sender, 0 )
+#define nil_send_msg(nil_phone, device_id, packet, sender)	\
+	generic_send_msg(nil_phone, NET_NIL_SEND, device_id, packet_get_id(packet), sender, 0)
 
 /** Returns the device packet dimension for sending.
@@ -106,6 +106,6 @@
  *  @returns Other error codes as defined for the generic_packet_size_req() function.
  */
-#define nil_packet_size_req( nil_phone, device_id, packet_dimension )	\
-	generic_packet_size_req( nil_phone, NET_NIL_PACKET_SPACE, device_id, packet_dimension )
+#define nil_packet_size_req(nil_phone, device_id, packet_dimension)	\
+	generic_packet_size_req(nil_phone, NET_NIL_PACKET_SPACE, device_id, packet_dimension)
 
 /** Registers new device or updates the MTU of an existing one.
@@ -119,6 +119,6 @@
  *  @returns Other error codes as defined for the generic_device_req() function.
  */
-#define nil_device_req( nil_phone, device_id, mtu, netif_service )	\
-	generic_device_req( nil_phone, NET_NIL_DEVICE, device_id, mtu, netif_service )
+#define nil_device_req(nil_phone, device_id, mtu, netif_service)	\
+	generic_device_req(nil_phone, NET_NIL_DEVICE, device_id, mtu, netif_service)
 
 /** Notifies the network interface layer about the device state change.
@@ -129,5 +129,5 @@
  *  @returns Other error codes as defined for each specific module device state function.
  */
-int nil_device_state_msg( int nil_phone, device_id_t device_id, int state );
+int nil_device_state_msg(int nil_phone, device_id_t device_id, int state);
 
 /** Passes the packet queue to the network interface layer.
@@ -140,5 +140,5 @@
  *  @returns Other error codes as defined for each specific module received function.
  */
-int nil_received_msg( int nil_phone, device_id_t device_id, packet_t packet, services_t target );
+int nil_received_msg(int nil_phone, device_id_t device_id, packet_t packet, services_t target);
 
 /** Creates bidirectional connection with the network interface layer module and registers the message receiver.
@@ -151,6 +151,6 @@
  *  @returns Other error codes as defined for the bind_service() function.
  */
-#define	nil_bind_service( service, device_id, me, receiver )	\
-	bind_service( service, device_id, me, 0, receiver );
+#define	nil_bind_service(service, device_id, me, receiver)	\
+	bind_service(service, device_id, me, 0, receiver);
 /*@}*/
 
Index: uspace/srv/net/include/protocol_map.h
===================================================================
--- uspace/srv/net/include/protocol_map.h	(revision 8edacbce0741266516f28901a084219ffd7e4a9f)
+++ uspace/srv/net/include/protocol_map.h	(revision aadf01ebd2c032bc8dd43a6e06ae5715e6c2710f)
@@ -50,9 +50,9 @@
  *  @returns 0 if mapping is not found.
  */
-static inline eth_type_t protocol_map( services_t nil, services_t il ){
-	switch( nil ){
+static inline eth_type_t protocol_map(services_t nil, services_t il){
+	switch(nil){
 		case SERVICE_ETHERNET:
 		case SERVICE_DP8390:
-			switch( il ){
+			switch(il){
 				case SERVICE_IP:
 					return ETH_P_IP;
@@ -73,9 +73,9 @@
  *  @returns 0 if mapping is not found.
  */
-static inline services_t protocol_unmap( services_t nil, int protocol ){
-	switch( nil ){
+static inline services_t protocol_unmap(services_t nil, int protocol){
+	switch(nil){
 		case SERVICE_ETHERNET:
 		case SERVICE_DP8390:
-			switch( protocol ){
+			switch(protocol){
 				case ETH_P_IP:
 					return SERVICE_IP;
@@ -95,6 +95,6 @@
  *  @returns ETH_LSAP_NULL if mapping is not found.
  */
-static inline eth_type_t lsap_map( eth_lsap_t lsap ){
-	switch( lsap ){
+static inline eth_type_t lsap_map(eth_lsap_t lsap){
+	switch(lsap){
 		case ETH_LSAP_IP:
 			return ETH_P_IP;
@@ -111,6 +111,6 @@
  *  @returns 0 if mapping is not found.
  */
-static inline eth_lsap_t lsap_unmap( eth_type_t ethertype ){
-	switch( ethertype ){
+static inline eth_lsap_t lsap_unmap(eth_type_t ethertype){
+	switch(ethertype){
 		case ETH_P_IP:
 			return ETH_LSAP_IP;
@@ -127,6 +127,6 @@
  *  @returns 0 if mapping is not found.
  */
-static inline hw_type_t hardware_map( services_t nil ){
-	switch( nil ){
+static inline hw_type_t hardware_map(services_t nil){
+	switch(nil){
 		case SERVICE_ETHERNET:
 		case SERVICE_DP8390:
Index: uspace/srv/net/include/socket.h
===================================================================
--- uspace/srv/net/include/socket.h	(revision 8edacbce0741266516f28901a084219ffd7e4a9f)
+++ uspace/srv/net/include/socket.h	(revision aadf01ebd2c032bc8dd43a6e06ae5715e6c2710f)
@@ -65,5 +65,5 @@
  *  @returns Other error codes as defined for the bind_service_timeout() function.
  */
-int	socket( int domain, int type, int protocol );
+int socket(int domain, int type, int protocol);
 
 /** Binds the socket to a port address.
@@ -77,5 +77,5 @@
  *  @returns Other error codes as defined for the NET_SOCKET_BIND message.
  */
-int	bind( int socket_id, const struct sockaddr * my_addr, socklen_t addrlen );
+int bind(int socket_id, const struct sockaddr * my_addr, socklen_t addrlen);
 
 /** Sets the number of connections waiting to be accepted.
@@ -87,5 +87,5 @@
  *  @returns Other error codes as defined for the NET_SOCKET_LISTEN message.
  */
-int	listen( int socket_id, int backlog );
+int listen(int socket_id, int backlog);
 
 /** Accepts waiting socket.
@@ -100,5 +100,5 @@
  *  @returns Other error codes as defined for the NET_SOCKET_ACCEPT message.
  */
-int	accept( int socket_id, struct sockaddr * cliaddr, socklen_t * addrlen );
+int accept(int socket_id, struct sockaddr * cliaddr, socklen_t * addrlen);
 
 /** Connects socket to the remote server.
@@ -112,5 +112,5 @@
  *  @returns Other error codes as defined for the NET_SOCKET_CONNECT message.
  */
-int	connect( int socket_id, const struct sockaddr * serv_addr, socklen_t addrlen );
+int connect(int socket_id, const struct sockaddr * serv_addr, socklen_t addrlen);
 
 /** Closes the socket.
@@ -121,5 +121,5 @@
  *  @returns Other error codes as defined for the NET_SOCKET_CLOSE message.
  */
-int	closesocket( int socket_id );
+int closesocket(int socket_id);
 
 /** Sends data via the socket.
@@ -134,5 +134,5 @@
  *  @returns Other error codes as defined for the NET_SOCKET_SEND message.
  */
-int send( int socket_id, void * data, size_t datalength, int flags );
+int send(int socket_id, void * data, size_t datalength, int flags);
 
 /** Sends data via the socket to the remote address.
@@ -150,5 +150,5 @@
  *  @returns Other error codes as defined for the NET_SOCKET_SENDTO message.
  */
-int sendto( int socket_id, const void * data, size_t datalength, int flags, const struct sockaddr * toaddr, socklen_t addrlen );
+int sendto(int socket_id, const void * data, size_t datalength, int flags, const struct sockaddr * toaddr, socklen_t addrlen);
 
 /** Receives data via the socket.
@@ -163,5 +163,5 @@
  *  @returns Other error codes as defined for the NET_SOCKET_RECV message.
  */
-int recv( int socket_id, void * data, size_t datalength, int flags );
+int recv(int socket_id, void * data, size_t datalength, int flags);
 
 /** Receives data via the socket.
@@ -178,5 +178,5 @@
  *  @returns Other error codes as defined for the NET_SOCKET_RECVFROM message.
  */
-int recvfrom( int socket_id, void * data, size_t datalength, int flags, struct sockaddr * fromaddr, socklen_t * addrlen );
+int recvfrom(int socket_id, void * data, size_t datalength, int flags, struct sockaddr * fromaddr, socklen_t * addrlen);
 
 /** Gets socket option.
@@ -192,5 +192,5 @@
  *  @returns Other error codes as defined for the NET_SOCKET_GETSOCKOPT message.
  */
-int	getsockopt( int socket_id, int level, int optname, void * value, size_t * optlen );
+int getsockopt(int socket_id, int level, int optname, void * value, size_t * optlen);
 
 /** Sets socket option.
@@ -206,5 +206,5 @@
  *  @returns Other error codes as defined for the NET_SOCKET_SETSOCKOPT message.
  */
-int	setsockopt( int socket_id, int level, int optname, const void * value, size_t optlen );
+int setsockopt(int socket_id, int level, int optname, const void * value, size_t optlen);
 
 /*@}*/
Index: uspace/srv/net/include/socket_codes.h
===================================================================
--- uspace/srv/net/include/socket_codes.h	(revision 8edacbce0741266516f28901a084219ffd7e4a9f)
+++ uspace/srv/net/include/socket_codes.h	(revision aadf01ebd2c032bc8dd43a6e06ae5715e6c2710f)
@@ -442,11 +442,11 @@
 	/** Stream (connection oriented) socket.
 	 */
-	SOCK_STREAM	= 1,
+	SOCK_STREAM = 1,
 	/** Datagram (connectionless oriented) socket.
 	 */
-	SOCK_DGRAM	= 2,
+	SOCK_DGRAM = 2,
 	/** Raw socket.
 	 */
-	SOCK_RAW	= 3
+	SOCK_RAW = 3
 } sock_type_t;
 
Index: uspace/srv/net/include/tl_interface.h
===================================================================
--- uspace/srv/net/include/tl_interface.h	(revision 8edacbce0741266516f28901a084219ffd7e4a9f)
+++ uspace/srv/net/include/tl_interface.h	(revision aadf01ebd2c032bc8dd43a6e06ae5715e6c2710f)
@@ -64,6 +64,6 @@
  *  @returns EOK on success.
  */
-inline static int	tl_received_msg( int tl_phone, device_id_t device_id, packet_t packet, services_t target, services_t error ){
-	return generic_received_msg( tl_phone, NET_TL_RECEIVED, device_id, packet_get_id( packet ), target, error );
+inline static int tl_received_msg(int tl_phone, device_id_t device_id, packet_t packet, services_t target, services_t error){
+	return generic_received_msg(tl_phone, NET_TL_RECEIVED, device_id, packet_get_id(packet), target, error);
 }