diff --git a/net/icmpv6/icmpv6_autoconfig.c b/net/icmpv6/icmpv6_autoconfig.c
index 08ec223def..7dc31617e7 100644
--- a/net/icmpv6/icmpv6_autoconfig.c
+++ b/net/icmpv6/icmpv6_autoconfig.c
@@ -499,7 +499,7 @@ int icmpv6_autoconfig(FAR struct net_driver_s *dev)
       ninfo("Timed out... retrying %d\n", retries + 1);
     }
 
-  /* Check for failures.  Note:  On successful return, the network will be 
+  /* Check for failures.  Note:  On successful return, the network will be
    * in the down state, but not in the event of failures.
    */
 
diff --git a/net/neighbor/neighbor_ethernet_out.c b/net/neighbor/neighbor_ethernet_out.c
index adfff98723..f342f7cc40 100644
--- a/net/neighbor/neighbor_ethernet_out.c
+++ b/net/neighbor/neighbor_ethernet_out.c
@@ -121,7 +121,7 @@ static const uint8_t g_multicast_ethaddr[3] =
  *
  *   If no Neighbor Table entry is found for the destination IPv6 address,
  *   the packet in the d_buf is replaced by an ICMPv6 Neighbor Solicit
- *   request packet for the IPv6 address. The IPv6 packet is dropped and 
+ *   request packet for the IPv6 address. The IPv6 packet is dropped and
  *   it is assumed that the higher level protocols (e.g., TCP) eventually
  *   will retransmit the dropped packet.
  *
@@ -161,7 +161,7 @@ void neighbor_out(FAR struct net_driver_s *dev)
 
   /* First check if destination is a IPv6 multicast address.  IPv6
    * multicast addresses in IPv6 have the prefix ff00::/8
-   * 
+   *
    *   Bits 120-127: Prefix
    *   Bits 116-119: Flags (1, 2, or 3 defined)
    *   Bits 112-115: Scope
diff --git a/net/sixlowpan/sixlowpan_framer.c b/net/sixlowpan/sixlowpan_framer.c
index 18e7cd56d0..91bff0cf76 100644
--- a/net/sixlowpan/sixlowpan_framer.c
+++ b/net/sixlowpan/sixlowpan_framer.c
@@ -228,7 +228,7 @@ int sixlowpan_meta_data(FAR struct ieee802154_driver_s *ieee,
 #ifdef CONFIG_IEEE802154_SECURITY
 #  warning CONFIG_IEEE802154_SECURITY not yet supported
 #endif
-  
+
 #ifdef CONFIG_IEEE802154_UWB
 #  warning CONFIG_IEEE802154_UWB not yet supported
 #endif
diff --git a/net/usrsock/Make.defs b/net/usrsock/Make.defs
index 2aa069b077..9432883a4d 100644
--- a/net/usrsock/Make.defs
+++ b/net/usrsock/Make.defs
@@ -40,7 +40,7 @@ ifeq ($(CONFIG_NET_USRSOCK),y)
 NET_CSRCS += usrsock_close.c usrsock_conn.c usrsock_bind.c usrsock_connect.c
 NET_CSRCS += usrsock_dev.c
 NET_CSRCS += usrsock_event.c usrsock_getsockname.c usrsock_getsockopt.c
-NET_CSRCS += usrsock_poll.c usrsock_recvfrom.c usrsock_sendto.c 
+NET_CSRCS += usrsock_poll.c usrsock_recvfrom.c usrsock_sendto.c
 NET_CSRCS += usrsock_setsockopt.c usrsock_socket.c
 
 # Include User Socket build support
diff --git a/net/utils/net_ipv6_mask2pref.c b/net/utils/net_ipv6_mask2pref.c
index 763fc0188a..cc4fd245c8 100644
--- a/net/utils/net_ipv6_mask2pref.c
+++ b/net/utils/net_ipv6_mask2pref.c
@@ -50,7 +50,7 @@
  * Private Data
  ****************************************************************************/
 
-static const uint8_t g_nibblemap[16] = 
+static const uint8_t g_nibblemap[16] =
 {
   0, 0, 0, 0, 0, 0, 0, 0, /* 0: No bits, 1-7: Should not happen */
   1, 1, 1, 1,             /* 8: 1 bit, 9-b: Should not happen */
diff --git a/net/utils/net_ipv6_pref2mask.c b/net/utils/net_ipv6_pref2mask.c
index 7155f5856b..3255e17868 100644
--- a/net/utils/net_ipv6_pref2mask.c
+++ b/net/utils/net_ipv6_pref2mask.c
@@ -75,7 +75,7 @@ void net_ipv6_pref2mask(uint8_t preflen, net_ipv6addr_t mask)
    * Eg. preflen = 38
    *     NETMASK: ffff ffff fc00 0000  0000 0000 0000 0000
    *     bit:                                       1 1..1
-   *                 1 1..3 3..4 4..6  6..7 8..9 9..1 1..2  
+   *                 1 1..3 3..4 4..6  6..7 8..9 9..1 1..2
    *              0..5 6..1 2..7 8..3  4..9 0..5 6..1 2..7
    *     preflen:                                   1 1..1
    *                 1 1..3 3..4 4..6  6..8 8..9 9..1 1..2