diff --git a/src/linux/net/newip/nip_output.c b/src/linux/net/newip/nip_output.c
index 3338fe3aa8b5d224eef0c3e54c868a5fd3b04a63..db125782cd0cae1d9df29d7ef044e29b1770b49a 100644
--- a/src/linux/net/newip/nip_output.c
+++ b/src/linux/net/newip/nip_output.c
@@ -103,8 +103,11 @@ int nip_send_skb(struct sk_buff *skb)
 
 	net = skb->sk ? sock_net(skb->sk) : dev_net(skb_dst(skb)->dev);
 	err = nip_local_out(net, skb->sk, skb);
-	if (err)
-		DEBUG("%s: failed to out skb!", __func__);
+	if (err) {
+		if (err > 0)
+			err = net_xmit_errno(err);
+		DEBUG("%s: failed to out skb! err = %d", __func__, err);
+	}
 
 	return err;
 }
diff --git a/src/linux/net/newip/tcp_nip.c b/src/linux/net/newip/tcp_nip.c
index dca377166b9de9b03e20277798667e9e26b629ef..60b949a447676f0df516f61aae8d4b110da08721 100644
--- a/src/linux/net/newip/tcp_nip.c
+++ b/src/linux/net/newip/tcp_nip.c
@@ -1528,8 +1528,7 @@ static void tcp_nip_early_demux(struct sk_buff *skb)
 
 			if (dst)
 				dst = dst_check(dst, 0);
-			if (dst &&
-			    inet_sk(sk)->rx_dst_ifindex == skb->skb_iif) {
+			if (dst && inet_sk(sk)->rx_dst_ifindex == skb->skb_iif) {
 				DEBUG("%s: find sock in ehash, set dst for skb", __func__);
 				skb_dst_set_noref(skb, dst);
 			}