Index: uspace/lib/nic/src/nic_driver.c
===================================================================
--- uspace/lib/nic/src/nic_driver.c	(revision eed4139909f4e93017245a6736941de6564db9fe)
+++ uspace/lib/nic/src/nic_driver.c	(revision e3f819f43b108ff90a50324cbced9c2b89d2171e)
@@ -170,6 +170,6 @@
  */
 void nic_set_state_change_handlers(nic_t *nic_data,
-	state_change_handler on_activating, state_change_handler on_going_down,
-	state_change_handler on_stopping)
+    state_change_handler on_activating, state_change_handler on_going_down,
+    state_change_handler on_stopping)
 {
 	nic_data->on_activating = on_activating;
@@ -190,9 +190,9 @@
  */
 void nic_set_filtering_change_handlers(nic_t *nic_data,
-	unicast_mode_change_handler on_unicast_mode_change,
-	multicast_mode_change_handler on_multicast_mode_change,
-	broadcast_mode_change_handler on_broadcast_mode_change,
-	blocked_sources_change_handler on_blocked_sources_change,
-	vlan_mask_change_handler on_vlan_mask_change)
+    unicast_mode_change_handler on_unicast_mode_change,
+    multicast_mode_change_handler on_multicast_mode_change,
+    broadcast_mode_change_handler on_broadcast_mode_change,
+    blocked_sources_change_handler on_blocked_sources_change,
+    vlan_mask_change_handler on_vlan_mask_change)
 {
 	nic_data->on_unicast_mode_change = on_unicast_mode_change;
@@ -212,5 +212,5 @@
  */
 void nic_set_wol_virtue_change_handlers(nic_t *nic_data,
-	wol_virtue_add_handler on_wv_add, wol_virtue_remove_handler on_wv_remove)
+    wol_virtue_add_handler on_wv_add, wol_virtue_remove_handler on_wv_remove)
 {
 	assert(on_wv_add != NULL && on_wv_remove != NULL);
@@ -227,5 +227,5 @@
  */
 void nic_set_poll_handlers(nic_t *nic_data,
-	poll_mode_change_handler on_poll_mode_change, poll_request_handler on_poll_req)
+    poll_mode_change_handler on_poll_mode_change, poll_request_handler on_poll_req)
 {
 	nic_data->on_poll_mode_change = on_poll_mode_change;
@@ -369,5 +369,5 @@
  */
 void nic_frame_list_append(nic_frame_list_t *frames,
-	nic_frame_t *frame)
+    nic_frame_t *frame)
 {
 	assert(frame != NULL && frames != NULL);
@@ -400,5 +400,5 @@
  */
 errno_t nic_report_poll_mode(nic_t *nic_data, nic_poll_mode_t mode,
-	struct timeval *period)
+    struct timeval *period)
 {
 	errno_t rc = EOK;
@@ -408,6 +408,6 @@
 	if (mode == NIC_POLL_PERIODIC) {
 		if (period) {
-			memcpy(&nic_data->default_poll_period, period, sizeof (struct timeval));
-			memcpy(&nic_data->poll_period, period, sizeof (struct timeval));
+			memcpy(&nic_data->default_poll_period, period, sizeof(struct timeval));
+			memcpy(&nic_data->poll_period, period, sizeof(struct timeval));
 		} else {
 			rc = EINVAL;
@@ -482,5 +482,6 @@
  * @param address The output for address.
  */
-void nic_query_address(nic_t *nic_data, nic_address_t *addr) {
+void nic_query_address(nic_t *nic_data, nic_address_t *addr)
+{
 	if (!addr)
 		return;
@@ -575,5 +576,5 @@
 	while (!list_empty(frames)) {
 		nic_frame_t *frame =
-			list_get_instance(list_first(frames), nic_frame_t, link);
+		    list_get_instance(list_first(frames), nic_frame_t, link);
 
 		list_remove(&frame->link);
@@ -685,8 +686,8 @@
  */
 void nic_report_hw_filtering(nic_t *nic_data,
-	int unicast_exact, int multicast_exact, int vlan_exact)
+    int unicast_exact, int multicast_exact, int vlan_exact)
 {
 	nic_rxc_hw_filtering(&nic_data->rx_control,
-		unicast_exact, multicast_exact, vlan_exact);
+	    unicast_exact, multicast_exact, vlan_exact);
 }
 
@@ -739,10 +740,10 @@
  */
 void nic_query_unicast(const nic_t *nic_data,
-	nic_unicast_mode_t *mode,
-	size_t max_count, nic_address_t *address_list, size_t *address_count)
+    nic_unicast_mode_t *mode,
+    size_t max_count, nic_address_t *address_list, size_t *address_count)
 {
 	assert(mode != NULL);
 	nic_rxc_unicast_get_mode(&nic_data->rx_control, mode,
-		max_count, address_list, address_count);
+	    max_count, address_list, address_count);
 }
 
@@ -759,10 +760,10 @@
  */
 void nic_query_multicast(const nic_t *nic_data,
-	nic_multicast_mode_t *mode,
-	size_t max_count, nic_address_t *address_list, size_t *address_count)
+    nic_multicast_mode_t *mode,
+    size_t max_count, nic_address_t *address_list, size_t *address_count)
 {
 	assert(mode != NULL);
 	nic_rxc_multicast_get_mode(&nic_data->rx_control, mode,
-		max_count, address_list, address_count);
+	    max_count, address_list, address_count);
 }
 
@@ -775,5 +776,5 @@
  */
 void nic_query_broadcast(const nic_t *nic_data,
-	nic_broadcast_mode_t *mode)
+    nic_broadcast_mode_t *mode)
 {
 	assert(mode != NULL);
@@ -792,8 +793,8 @@
  */
 void nic_query_blocked_sources(const nic_t *nic_data,
-	size_t max_count, nic_address_t *address_list, size_t *address_count)
+    size_t max_count, nic_address_t *address_list, size_t *address_count)
 {
 	nic_rxc_blocked_sources_get(&nic_data->rx_control,
-		max_count, address_list, address_count);
+	    max_count, address_list, address_count);
 }
 
@@ -979,5 +980,5 @@
  */
 void nic_report_receive_error(nic_t *nic_data,
-	nic_receive_error_cause_t cause, unsigned count)
+    nic_receive_error_cause_t cause, unsigned count)
 {
 	fibril_rwlock_write_lock(&nic_data->stats_lock);
@@ -1027,5 +1028,6 @@
  *  @returns Nonzero if t is zero interval
  */
-static int timeval_nonpositive(struct timeval t) {
+static int timeval_nonpositive(struct timeval t)
+{
 	return (t.tv_sec <= 0) && (t.tv_usec <= 0);
 }
Index: uspace/lib/nic/src/nic_wol_virtues.c
===================================================================
--- uspace/lib/nic/src/nic_wol_virtues.c	(revision eed4139909f4e93017245a6736941de6564db9fe)
+++ uspace/lib/nic/src/nic_wol_virtues.c	(revision e3f819f43b108ff90a50324cbced9c2b89d2171e)
@@ -48,5 +48,5 @@
 static size_t nic_wv_key_hash(void *key)
 {
-	return *(nic_wv_id_t*) key;
+	return *(nic_wv_id_t *) key;
 }
 
@@ -60,5 +60,5 @@
 {
 	nic_wol_virtue_t *virtue = (nic_wol_virtue_t *) item;
-	return (virtue->id == *(nic_wv_id_t*) key);
+	return (virtue->id == *(nic_wv_id_t *) key);
 }
 
@@ -141,5 +141,5 @@
 	case NIC_WV_MAGIC_PACKET:
 		return data == NULL || length == sizeof (nic_wv_magic_packet_data_t) ?
-			EOK : EINVAL;
+		    EOK : EINVAL;
 	default:
 		return ENOTSUP;
@@ -163,5 +163,5 @@
 {
 	if (!nic_wv_is_multi(virtue->type) &&
-		wvs->lists[virtue->type] != NULL) {
+	    wvs->lists[virtue->type] != NULL) {
 		return EINVAL;
 	}
@@ -188,5 +188,5 @@
 {
 	nic_wol_virtue_t *virtue =
-		(nic_wol_virtue_t *) hash_table_find(&wvs->table, &id);
+	    (nic_wol_virtue_t *) hash_table_find(&wvs->table, &id);
 	if (virtue == NULL) {
 		return NULL;
@@ -224,5 +224,5 @@
  */
 const nic_wol_virtue_t *nic_wol_virtues_find(const nic_wol_virtues_t *wvs,
-	nic_wv_id_t id)
+    nic_wv_id_t id)
 {
 	/*
@@ -248,5 +248,5 @@
  */
 errno_t nic_wol_virtues_list(const nic_wol_virtues_t *wvs, nic_wv_type_t type,
-	size_t max_count, nic_wv_id_t *id_list, size_t *id_count)
+    size_t max_count, nic_wv_id_t *id_list, size_t *id_count)
 {
 	size_t count = 0;