Index: uspace/lib/nic/include/nic_impl.h
===================================================================
--- uspace/lib/nic/include/nic_impl.h	(revision ae7d03c05f24b857bbbdbcf3dafbf8ecc6c286ab)
+++ uspace/lib/nic/include/nic_impl.h	(revision a4eb3ba2b6a831a2a639dfe74c4deb2ca435b91c)
@@ -43,6 +43,8 @@
 #include <ddf/driver.h>
 
-/* Inclusion of this file is not prohibited, because drivers could want to
- * inject some adaptation layer between the DDF call and NICF implementation */
+/*
+ * Inclusion of this file is not prohibited, because drivers could want to
+ * inject some adaptation layer between the DDF call and NICF implementation
+ */
 
 extern errno_t nic_get_address_impl(ddf_fun_t *dev_fun, nic_address_t *address);
Index: uspace/lib/nic/src/nic_driver.c
===================================================================
--- uspace/lib/nic/src/nic_driver.c	(revision ae7d03c05f24b857bbbdbcf3dafbf8ecc6c286ab)
+++ uspace/lib/nic/src/nic_driver.c	(revision a4eb3ba2b6a831a2a639dfe74c4deb2ca435b91c)
@@ -518,6 +518,8 @@
 void nic_received_frame(nic_t *nic_data, nic_frame_t *frame)
 {
-	/* Note: this function must not lock main lock, because loopback driver
-	 * 		 calls it inside send_frame handler (with locked main lock) */
+	/*
+	 * Note: this function must not lock main lock, because loopback driver
+	 * 		 calls it inside send_frame handler (with locked main lock)
+	 */
 	fibril_rwlock_read_lock(&nic_data->rxc_lock);
 	nic_frame_type_t frame_type;
@@ -1062,5 +1064,6 @@
 			if (remaining.tv_sec > 0) {
 				time_t wait_sec = remaining.tv_sec;
-				/* wait maximaly 5 seconds to get reasonable reaction time
+				/*
+				 * wait maximaly 5 seconds to get reasonable reaction time
 				 * when period is reset
 				 */
Index: uspace/lib/nic/src/nic_impl.c
===================================================================
--- uspace/lib/nic/src/nic_impl.c	(revision ae7d03c05f24b857bbbdbcf3dafbf8ecc6c286ab)
+++ uspace/lib/nic/src/nic_impl.c	(revision a4eb3ba2b6a831a2a639dfe74c4deb2ca435b91c)
@@ -123,7 +123,9 @@
 		    sizeof(struct timeval));
 		if (rc != EOK) {
-			/* We have already ran the on stopped handler, even if we
+			/*
+			 * We have already ran the on stopped handler, even if we
 			 * terminated the state change we would end up in undefined state.
-			 * Therefore we just log the problem. */
+			 * Therefore we just log the problem.
+			 */
 		}
 
@@ -302,5 +304,6 @@
 		rc = nic_rxc_unicast_set_mode(&nic_data->rx_control, mode,
 		    addr_list, addr_count);
-		/* After changing the mode the addr db gets cleared, therefore we have
+		/*
+		 * After changing the mode the addr db gets cleared, therefore we have
 		 * to reinsert also the physical address of NIC.
 		 */
@@ -737,6 +740,8 @@
 {
 	nic_t *nic_data = nic_get_from_ddf_fun(fun);
-	/* If the driver does not implement the poll mode change handler it cannot
-	 * switch off interrupts and this is not supported. */
+	/*
+	 * If the driver does not implement the poll mode change handler it cannot
+	 * switch off interrupts and this is not supported.
+	 */
 	if (nic_data->on_poll_mode_change == NULL)
 		return ENOTSUP;