diff --git a/src/linux/net/newip/Kconfig b/src/linux/net/newip/Kconfig
deleted file mode 100644
index 93ad569..0000000
--- a/src/linux/net/newip/Kconfig
+++ /dev/null
@@ -1,18 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only
-#
-# Copyright (c) 2022 Huawei Device Co., Ltd.
-#
-# NewIP configuration
-#
-
-# NewIP as module will cause a CRASH if you try to unload it
-
-# linux-5.10/net/Kconfig define NEWIP
-if NEWIP
-config NEWIP_FAST_KEEPALIVE
-	tristate "NewIP fast keepalive"
-	default n
-	help
-	  Support for NewIP fast keepalive.
-endif # NEWIP
-
diff --git a/src/linux/net/newip/af_ninet.c b/src/linux/net/newip/af_ninet.c
index 867f4d2..b193f9f 100644
--- a/src/linux/net/newip/af_ninet.c
+++ b/src/linux/net/newip/af_ninet.c
@@ -7,7 +7,7 @@
  *
  * Based on  linux/net/ipv6/af_inet6.c
  */
-#define pr_fmt(fmt) "NIP AF-NIET: " fmt
+#define pr_fmt(fmt) "NIP: " fmt
 
 #include <linux/module.h>
 #include <linux/capability.h>
diff --git a/src/linux/net/newip/hooks/Kconfig b/src/linux/net/newip/hooks/Kconfig
deleted file mode 100644
index 83e2e44..0000000
--- a/src/linux/net/newip/hooks/Kconfig
+++ /dev/null
@@ -1,20 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only
-#
-# Copyright (c) 2022 Huawei Device Co., Ltd.
-#
-# NewIP Hooks configuration
-#
-
-menu "NewIP Hooks"
-
-config NEWIP_HOOKS
-	tristate "NewIP Hooks"
-	depends on VENDOR_HOOKS && NEWIP
-	default n
-	help
-	  Enable NewIP hooks implemented as tracepoints
-
-	  Allow NewIP modules to attach to tracepoint "hooks" defined via
-	  DECLARE_TRACE or DECLARE_HOOK
-
-endmenu
diff --git a/src/linux/net/newip/icmp.c b/src/linux/net/newip/icmp.c
index c376a0e..0f3a953 100644
--- a/src/linux/net/newip/icmp.c
+++ b/src/linux/net/newip/icmp.c
@@ -8,6 +8,8 @@
  * Based on net/ipv6/icmp.c
  * Based on net/ipv4/af_inet.c
  */
+#define pr_fmt(fmt) "NIP-ICMP: " fmt
+
 #include <linux/module.h>
 #include <linux/errno.h>
 #include <linux/types.h>
diff --git a/src/linux/net/newip/ninet_connection_sock.c b/src/linux/net/newip/ninet_connection_sock.c
index 7d92e4f..288cef5 100644
--- a/src/linux/net/newip/ninet_connection_sock.c
+++ b/src/linux/net/newip/ninet_connection_sock.c
@@ -11,6 +11,8 @@
  *
  * Based on net/ipv4/inet_connection_sock.c
  */
+#define pr_fmt(fmt) "NIP: " fmt
+
 #include <linux/module.h>
 #include <linux/nip.h>
 #include <linux/jhash.h>
diff --git a/src/linux/net/newip/ninet_hashtables.c b/src/linux/net/newip/ninet_hashtables.c
index b777636..5dfea02 100644
--- a/src/linux/net/newip/ninet_hashtables.c
+++ b/src/linux/net/newip/ninet_hashtables.c
@@ -15,6 +15,8 @@
  * Based on include/net/ipv6.h
  * Based on net/core/secure_seq.c
  */
+#define pr_fmt(fmt) "NIP: " fmt
+
 #include <linux/module.h>
 #include <linux/random.h>
 
diff --git a/src/linux/net/newip/nip_addrconf.c b/src/linux/net/newip/nip_addrconf.c
index e1ee256..56dc3cf 100644
--- a/src/linux/net/newip/nip_addrconf.c
+++ b/src/linux/net/newip/nip_addrconf.c
@@ -7,6 +7,8 @@
  *
  * Based on net/ipv6/addrconf.c
  */
+#define pr_fmt(fmt) "NIP: " fmt
+
 #include <linux/errno.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
diff --git a/src/linux/net/newip/nip_addrconf_core.c b/src/linux/net/newip/nip_addrconf_core.c
index 34e9867..e6835b2 100644
--- a/src/linux/net/newip/nip_addrconf_core.c
+++ b/src/linux/net/newip/nip_addrconf_core.c
@@ -7,6 +7,8 @@
  *
  * Based on net/ipv6/addrconf_core.c
  */
+#define pr_fmt(fmt) "NIP: " fmt
+
 #include <net/nip.h>
 #include <net/nip_addrconf.h>
 #include <net/ip.h>
diff --git a/src/linux/net/newip/nip_fib.c b/src/linux/net/newip/nip_fib.c
index d3ad7e9..2029798 100644
--- a/src/linux/net/newip/nip_fib.c
+++ b/src/linux/net/newip/nip_fib.c
@@ -7,6 +7,8 @@
  *
  * Based on net/ipv6/ip6_fib.c
  */
+#define pr_fmt(fmt) "NIP: " fmt
+
 #include <linux/errno.h>
 #include <linux/types.h>
 #include <linux/net.h>
diff --git a/src/linux/net/newip/nip_fib_rules.c b/src/linux/net/newip/nip_fib_rules.c
index 1f3481b..1dc26ed 100644
--- a/src/linux/net/newip/nip_fib_rules.c
+++ b/src/linux/net/newip/nip_fib_rules.c
@@ -7,6 +7,8 @@
  * Based on net/ipv6/fib_rules.c
  * Based on net/ipv6/fib6_rules.c
  */
+#define pr_fmt(fmt) "NIP: " fmt
+
 #include <net/nip_fib.h>
 #include <linux/netdevice.h>
 #include <linux/notifier.h>
diff --git a/src/linux/net/newip/nip_hooks_register.c b/src/linux/net/newip/nip_hooks_register.c
index 5122286..d8188cb 100644
--- a/src/linux/net/newip/nip_hooks_register.c
+++ b/src/linux/net/newip/nip_hooks_register.c
@@ -5,6 +5,8 @@
  * Definitions for the NewIP Hooks Register module.
  */
 #ifdef CONFIG_NEWIP_HOOKS
+#define pr_fmt(fmt) "NIP: " fmt
+
 #include <net/ninet_hashtables.h>      /* ninet_ehashfn */
 #include <trace/hooks/nip_hooks.h>
 
diff --git a/src/linux/net/newip/nip_input.c b/src/linux/net/newip/nip_input.c
index 5924887..5ea9443 100644
--- a/src/linux/net/newip/nip_input.c
+++ b/src/linux/net/newip/nip_input.c
@@ -7,6 +7,8 @@
  *
  * Based on net/ipv6/ip6_input.c
  */
+#define pr_fmt(fmt) "NIP-INPUT: " fmt
+
 #include <linux/errno.h>
 #include <linux/types.h>
 #include <linux/socket.h>
@@ -50,7 +52,7 @@ static int nip_rcv_finish(struct sk_buff *skb)
 	if (net->ipv4.sysctl_ip_early_demux && !skb_dst(skb) && !skb->sk) {
 		const struct ninet_protocol *ipprot;
 
-		DEBUG("%s: try to early demux skb.", __func__);
+		DEBUG("%s: try to early demux skb, nexthdr=0x%x.", __func__, NIPCB(skb)->nexthdr);
 		ipprot = rcu_dereference(ninet_protos[NIPCB(skb)->nexthdr]);
 		if (ipprot)
 			edemux = READ_ONCE(ipprot->early_demux);
diff --git a/src/linux/net/newip/nip_output.c b/src/linux/net/newip/nip_output.c
index d394937..6c5642a 100644
--- a/src/linux/net/newip/nip_output.c
+++ b/src/linux/net/newip/nip_output.c
@@ -7,6 +7,8 @@
  *
  * Based on net/ipv6/ip6_output.c
  */
+#define pr_fmt(fmt) "NIP-OUTPUT: " fmt
+
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
diff --git a/src/linux/net/newip/nip_sockglue.c b/src/linux/net/newip/nip_sockglue.c
index a94fbef..d33ac0b 100644
--- a/src/linux/net/newip/nip_sockglue.c
+++ b/src/linux/net/newip/nip_sockglue.c
@@ -10,6 +10,8 @@
  *
  * Based on net/ipv4/ip_sockglue.c
  */
+#define pr_fmt(fmt) "NIP: " fmt
+
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/skbuff.h>
diff --git a/src/linux/net/newip/nndisc.c b/src/linux/net/newip/nndisc.c
index e365b98..a46e4f2 100644
--- a/src/linux/net/newip/nndisc.c
+++ b/src/linux/net/newip/nndisc.c
@@ -7,6 +7,8 @@
  *
  * Based on net/ipv6/ndisc.c
  */
+#define pr_fmt(fmt) "NIP-ND: " fmt
+
 #include <linux/module.h>
 #include <linux/errno.h>
 #include <linux/types.h>
diff --git a/src/linux/net/newip/protocol.c b/src/linux/net/newip/protocol.c
index 1f35d9e..8d7f3ea 100644
--- a/src/linux/net/newip/protocol.c
+++ b/src/linux/net/newip/protocol.c
@@ -10,6 +10,8 @@
  *
  * Based on net/ipv6/protocol.c
  */
+#define pr_fmt(fmt) "NIP: " fmt
+
 #include <net/protocol.h>
 #include <linux/module.h>
 #include <linux/netdevice.h>
diff --git a/src/linux/net/newip/route.c b/src/linux/net/newip/route.c
index 33af9c1..3c4f407 100644
--- a/src/linux/net/newip/route.c
+++ b/src/linux/net/newip/route.c
@@ -12,6 +12,8 @@
  * Based on net/ipv4/route.c
  * Based on net/ipv6/route.c
  */
+#define pr_fmt(fmt) "NIP: " fmt
+
 #include <linux/module.h>
 #include <linux/netdevice.h>
 #include <linux/socket.h>
diff --git a/src/linux/net/newip/udp.c b/src/linux/net/newip/udp.c
index c36b6a1..1b4f3fb 100644
--- a/src/linux/net/newip/udp.c
+++ b/src/linux/net/newip/udp.c
@@ -12,6 +12,8 @@
  * Based on net/ipv4/udp.c
  * Based on net/ipv6/udp.c
  */
+#define pr_fmt(fmt) "NIP-UDP: " fmt
+
 #include <linux/uaccess.h>
 #include <linux/errno.h>
 #include <linux/if_arp.h>