diff --git a/include/nuttx/net/sixlowpan.h b/include/nuttx/net/sixlowpan.h
index 9f051857e43..43a1a9660e2 100644
--- a/include/nuttx/net/sixlowpan.h
+++ b/include/nuttx/net/sixlowpan.h
@@ -66,9 +66,9 @@
 /* Min and Max compressible UDP ports - HC06 */
 
 #define SIXLOWPAN_UDP_4_BIT_PORT_MIN     0xf0b0
-#define SIXLOWPAN_UDP_4_BIT_PORT_MAX     0xf0bf   /* F0B0 + 15 */
-#define SIXLOWPAN_UDP_8_BIT_PORT_MIN     0xF000
-#define SIXLOWPAN_UDP_8_BIT_PORT_MAX     0xf0ff   /* F000 + 255 */
+#define SIXLOWPAN_UDP_4_BIT_PORT_MAX     0xf0bf   /* f0b0 + 15 */
+#define SIXLOWPAN_UDP_8_BIT_PORT_MIN     0xf000
+#define SIXLOWPAN_UDP_8_BIT_PORT_MAX     0xf0ff   /* f000 + 255 */
 
 /* 6lowpan dispatches */
 
diff --git a/net/sixlowpan/Kconfig b/net/sixlowpan/Kconfig
index d7635cf3625..02d17a42f1c 100644
--- a/net/sixlowpan/Kconfig
+++ b/net/sixlowpan/Kconfig
@@ -54,7 +54,7 @@ config NET_6LOWPAN_COMPRESSION_THRESHOLD
 
 config NET_6LOWPAN_MINPORT
 	hex "Minimum port nubmer"
-	default 0x5471
+	default 0xf0b0
 	depends on NET_6LOWPAN_COMPRESSION_HC1
 	---help---
 		HC1 compression of UDP headersis feasible only if both src and dest
diff --git a/net/sixlowpan/sixlowpan_input.c b/net/sixlowpan/sixlowpan_input.c
index ffc85bdfcfb..2018cc1376e 100644
--- a/net/sixlowpan/sixlowpan_input.c
+++ b/net/sixlowpan/sixlowpan_input.c
@@ -356,7 +356,7 @@ static int sixlowpan_frame_process(FAR struct ieee802154_driver_s *ieee,
       else if (fragsize == 0)
         {
           nwarn("WARNING: Dropping zero-length 6loWPAN fragment\n");
-          return OK;
+          return INPUT_PARTIAL;
         }
 
       /* A non-zero, first fragement received while we are in the middle of
@@ -381,7 +381,7 @@ static int sixlowpan_frame_process(FAR struct ieee802154_driver_s *ieee,
 
           nwarn("WARNING: Dropping 6loWPAN packet that is not a fragment of "
                 "the packet currently being reassembled\n");
-          return OK;
+          return INPUT_PARTIAL;
         }
       else
         {
@@ -507,7 +507,7 @@ copypayload:
       ninfo("Required buffer size: %d+%d+%d=%d Available: %d\n",
             g_uncomp_hdrlen, (int)(fragoffset << 3), g_rime_payloadlen,
             reqsize, CONFIG_NET_6LOWPAN_MTU);
-      return OK;
+      return -ENOMEM;
     }
 
   memcpy((FAR uint8_t *)ieee->i_dev.d_buf + g_uncomp_hdrlen +
@@ -545,12 +545,10 @@ copypayload:
              ieee->i_accumlen, g_rime_payloadlen);
     }
   else
-#endif /* CONFIG_NET_6LOWPAN_FRAG */
     {
       ieee->i_pktlen = g_rime_payloadlen + g_uncomp_hdrlen;
     }
 
-#if CONFIG_NET_6LOWPAN_FRAG
   /* If we have a full IP packet in sixlowpan_buf, deliver it to
    * the IP stack
    */
@@ -560,23 +558,21 @@ copypayload:
 
   if (ieee->i_accumlen == 0 || ieee->i_accumlen == ieee->i_pktlen)
     {
-      FAR struct ipv6_hdr_s *ipv6 = IPv6BUF(&ieee->i_dev);
-
       ninfo("IP packet ready (length %d)\n", ieee->i_pktlen);
 
-      /* REVISIT -- clearly wrong. */
-      memcpy((FAR uint8_t *)ipv6, (FAR uint8_t *)ipv6, ieee->i_pktlen);
-
-      ieee->i_pktlen   = 0;
-      ieee->i_accumlen = 0;
-
+      ieee->i_dev.d_len = ieee->i_pktlen;
+      ieee->i_pktlen    = 0;
+      ieee->i_accumlen  = 0;
+      return INPUT_COMPLETE;
     }
-#endif /* CONFIG_NET_6LOWPAN_FRAG */
 
-  sixlowpan_dumpbuffer("IPv6 header",
-                       (FAR const uint8_t *)IPv6BUF(&ieee->i_dev),
-                       IPv6_HDRLEN);
-  return OK;
+  return INPUT_PARTIAL;
+#else
+  /* Deliver the packet to the IP stack */
+
+  ieee->i_dev.d_len = g_rime_payloadlen + g_uncomp_hdrlen;
+  return INPUT_COMPLETE;
+#endif /* CONFIG_NET_6LOWPAN_FRAG */
 }
 
 /****************************************************************************