diff -r 18eecf71f690 tools/vnet/vnet-module/esp.c
--- a/tools/vnet/vnet-module/esp.c	Fri Mar 31 13:39:42 2006
+++ b/tools/vnet/vnet-module/esp.c	Fri Mar 31 15:42:56 2006
@@ -281,7 +281,7 @@
     }
     skb_trim_tail(skb, icv_n);
   exit:
-    dprintf("< err=%d\n", err);
+    dprintf("< esp_check_icv err=%d\n", err);
     return err;
 }
 
@@ -384,7 +384,7 @@
     }
     err = Tunnel_send(tunnel, skb);
   exit:
-    dprintf("< err=%d\n", err);
+    dprintf("< esp_sa_send err=%d\n", err);
     return err;
 }
 
@@ -487,7 +487,7 @@
         }
         err = 1;
     }
-    dprintf("< skb=%p err=%d\n", skb, err);
+    dprintf("< esp_sa_recv skb=%p err=%d\n", skb, err);
     return err;
 }
 
@@ -627,7 +627,7 @@
     crypto_cipher_setkey(esp->cipher.tfm, esp->cipher.key, esp->cipher.key_n);
     err = 0;
   exit:
-    dprintf("< err=%d\n", err);
+    dprintf("< esp_cipher_int err=%d\n", err);
     return err;
 }
 
@@ -674,7 +674,7 @@
         goto exit;
     }
   exit:
-    dprintf("< err=%d\n", err);
+    dprintf("< esp_digest_init err=%d\n", err);
     return err;
 }
 
@@ -704,7 +704,7 @@
     if(err){
         if(esp) esp_fini(esp);
     }
-    dprintf("< err=%d\n", err);
+    dprintf("< esp_sa_init err=%d\n", err);
     return err;
 }
 
@@ -793,7 +793,7 @@
         kfree_skb(skb);
         err = 0;
     }
-    dprintf("< err=%d\n", err);
+    dprintf("< esp_protocol_recv err=%d\n", err);
     return err;
 }
 
@@ -884,7 +884,7 @@
     }
     esp_protocol_add();
   exit:
-    dprintf("< err=%d\n", err);
+    dprintf("< esp_module_init err=%d\n", err);
     return err;
 }
 
diff -r 18eecf71f690 tools/vnet/vnet-module/etherip.c
--- a/tools/vnet/vnet-module/etherip.c	Fri Mar 31 13:39:42 2006
+++ b/tools/vnet/vnet-module/etherip.c	Fri Mar 31 15:42:56 2006
@@ -198,7 +198,7 @@
     skb = NULL;
   exit:
     if(err && skb){
-        wprintf("< err=%d\n", err);
+        wprintf("< etherip_tunnel_send err=%d\n", err);
         kfree_skb(skb);
     }
     return err;
@@ -347,7 +347,7 @@
     err = vnet_skb_recv(skb, vinfo);
   exit:
     if(vinfo) Vnet_decref(vinfo);
-    dprintf("< skb=%p err=%d\n", skb, err);
+    dprintf("< etherip_protocol_recv skb=%p err=%d\n", skb, err);
     return err;
 }
 
diff -r 18eecf71f690 tools/vnet/vnet-module/sa.c
--- a/tools/vnet/vnet-module/sa.c	Fri Mar 31 13:39:42 2006
+++ b/tools/vnet/vnet-module/sa.c	Fri Mar 31 15:42:56 2006
@@ -365,7 +365,7 @@
     if(err && entries){
         sa_table_delete(state);
     }
-    dprintf("< err=%d\n", err);
+    dprintf("< sa_table_add err=%d\n", err);
     return err;
 }
 
@@ -441,7 +441,7 @@
     if(err) goto exit;
     sa_table_delete(existing);
   exit:
-    dprintf("< err=%d\n", err);
+    dprintf("< sa_table_replace err=%d\n", err);
     return err;
 }
 
@@ -524,7 +524,7 @@
         state = NULL;
     }
     *statep = state;
-    dprintf("< err=%d\n", err);
+    dprintf("< SAState_create err=%d\n", err);
     return err;
 }
 
@@ -587,7 +587,7 @@
     }
 
     err = sa_set(&info, 0, sa);
-    dprintf("< err=%d\n", err);
+    dprintf("< sa_create err=%d\n", err);
     return err;
 }
 
@@ -625,7 +625,7 @@
     } else {
         SAState_decref(state);
     }
-    dprintf("< err=%d\n", err);
+    dprintf("< sa_set err=%d\n", err);
     return err;
 }
 
@@ -691,7 +691,7 @@
 static int sa_tunnel_open(Tunnel *tunnel){
     int err = 0;
     //dprintf(">\n");
-    //dprintf("< err=%d\n", err);
+    //dprintf("< sa_tunnel_open err=%d\n", err);
     return err;
 }
 
diff -r 18eecf71f690 tools/vnet/vnet-module/skb_context.c
--- a/tools/vnet/vnet-module/skb_context.c	Fri Mar 31 13:39:42 2006
+++ b/tools/vnet/vnet-module/skb_context.c	Fri Mar 31 15:42:56 2006
@@ -73,7 +73,7 @@
     context->next = *val;
     *val = context;
   exit:
-    dprintf("< err=%d\n", err);
+    dprintf("< SkbContext_push err=%d\n", err);
     return err;
 }
 
@@ -85,7 +85,7 @@
 
     //err = SkbContext_push(&ctxt, vnet, addr, protocol, data, free_fn); //todo fixme
     //SKB_CONTEXT(skb) = ctxt;//todo fixme
-    dprintf("< err=%d\n", err);
+    dprintf("< skb_push_context err=%d\n", err);
     return err;
 }
                                        
diff -r 18eecf71f690 tools/vnet/vnet-module/skb_util.c
--- a/tools/vnet/vnet-module/skb_util.c	Fri Mar 31 13:39:42 2006
+++ b/tools/vnet/vnet-module/skb_util.c	Fri Mar 31 15:42:56 2006
@@ -133,7 +133,7 @@
             skb_headroom(*pskb), head_n,
             skb_tailroom(*pskb), tail_n);
   exit:
-    dprintf("< err=%d\n", err);
+    dprintf("< skb_make_room err=%d\n", err);
     return err;
 }
 
@@ -374,7 +374,7 @@
     }
   exit:
     if(!err) *sg_n = sg_i;
-    if(len) wprintf("> len=%d\n", len);
+    if(len) wprintf("> sbk_scatterlist len=%d\n", len);
     if(len) BUG();
     if(err) dprintf("< err=%d sg_n=%d\n", err, *sg_n);
     return err;
diff -r 18eecf71f690 tools/vnet/vnet-module/tunnel.c
--- a/tools/vnet/vnet-module/tunnel.c	Fri Mar 31 13:39:42 2006
+++ b/tools/vnet/vnet-module/tunnel.c	Fri Mar 31 15:42:56 2006
@@ -95,12 +95,12 @@
         tunnel = NULL;
     }
     *val = tunnel;
-    dprintf("< err=%d\n", err);
+    dprintf("< tunnel_create err=%d\n", err);
     return err;
 }
 
 void TunnelStats_update(TunnelStats *stats, int len, int err){
-    dprintf(">len=%d  err=%d\n", len, err);
+    dprintf("> TunnelStats_update len=%d  err=%d\n", len, err);
     if(err){
         stats->dropped_bytes += len;
         stats->dropped_packets++;
@@ -139,7 +139,7 @@
     tunnel_table->key_hash_fn = tunnel_table_key_hash_fn;
     tunnel_table->key_equal_fn = tunnel_table_key_equal_fn;
   exit:
-    dprintf("< err=%d\n", err);
+    dprintf("< Tunnel_init(): err=%d\n", err);
     return err;
 }
     
@@ -213,7 +213,7 @@
         err = -ENOMEM;
     }
     tunnel_write_unlock(flags);
-    dprintf("< err=%d\n", err);
+    dprintf("< Tunnel_add err=%d\n", err);
     return err;
 }
 
@@ -244,7 +244,7 @@
     } else {
         err = skb_xmit(skb);
     }
-    dprintf("< err=%d\n", err);
+    dprintf("< Tunnel_send err=%d\n", err);
     return err;
 }
 
diff -r 18eecf71f690 tools/vnet/vnet-module/varp.c
--- a/tools/vnet/vnet-module/varp.c	Fri Mar 31 13:39:42 2006
+++ b/tools/vnet/vnet-module/varp.c	Fri Mar 31 15:42:56 2006
@@ -512,7 +512,7 @@
 
   exit:
     if(err && skbout) kfree_skb(skbout);
-    dprintf("< err=%d\n", err);
+    dprintf("< varp_send err=%d\n", err);
     return err;
 }
 
@@ -1002,7 +1002,7 @@
     VarpEntry_unlock(ventry, flags);
     err = vnet_tunnel_send(&vnet, &addr, skb);
     VarpEntry_lock(ventry, flags);
-    dprintf("< err=%d\n", err);
+    dprintf("< VarpEntry_send err=%d\n", err);
     return err;
 }
 
@@ -1050,7 +1050,7 @@
     } else {
         err = VarpEntry_send(ventry, skb);
     }
-    dprintf("< err=%d\n", err);
+    dprintf("< VarpEntry_resolve err=%d\n", err);
     return err;
 }
 
@@ -1143,7 +1143,7 @@
     //}
   exit:
     VarpEntry_unlock(ventry, flags);
-    dprintf("< err=%d\n", err);
+    dprintf("< VarpEntry_update err=%d\n", err);
     return err;
 }
     
@@ -1180,7 +1180,7 @@
     err = VarpEntry_update(ventry, addr, state, flags);
     VarpEntry_decref(ventry);
   exit:
-    dprintf("< err=%d\n", err);
+    dprintf("< VarpTable_update err=%d\n", err);
     return err;
 }
 
@@ -1297,7 +1297,7 @@
     varp_send(VARP_OP_ANNOUNCE, skb->dev, skb, vnet, vmac);
     vif_decref(vif);
   exit:
-    dprintf("< err=%d\n", err);
+    dprintf("< varp_handle_request err=%d\n", err);
     return err;
 }
 
@@ -1316,7 +1316,7 @@
     }
     err = varp_send(VARP_OP_ANNOUNCE, dev, NULL, &vif->vnet, &vif->vmac);
   exit:
-    dprintf("< err=%d\n", err);
+    dprintf("< varp_announce_vif err=%d\n", err);
     return err;
 }
 
@@ -1335,7 +1335,7 @@
                            &varph->vnet, &varph->vmac, &varph->addr,
                            VARP_STATE_REACHABLE, 
                            (VARP_UPDATE_CREATE | VARP_UPDATE_QUEUE));
-    dprintf("< err=%d\n", err);
+    dprintf("< varp_handle_announce err=%d\n", err);
     return err;
 }
 
@@ -1419,7 +1419,7 @@
         break;
     }
   exit:
-    dprintf("< err=%d\n", err);
+    dprintf("< varp_handle_message err=%d\n", err);
     return err;
 }
 
@@ -1462,7 +1462,7 @@
         }
     }
   exit:
-    dprintf("< err=%d\n", err);
+    dprintf("< varp_output err=%d\n", err);
     return err;
 }
 
diff -r 18eecf71f690 tools/vnet/vnet-module/varp_socket.c
--- a/tools/vnet/vnet-module/varp_socket.c	Fri Mar 31 13:39:42 2006
+++ b/tools/vnet/vnet-module/varp_socket.c	Fri Mar 31 15:42:56 2006
@@ -507,7 +507,7 @@
     }
   exit:
     *val = (err ? -1 : sock);
-    if(err) eprintf("> err=%d errno=%d\n", err, errno);
+    if(err) eprintf("> create_socket err=%d errno=%d\n", err, errno);
     return err;
 }
 
@@ -538,7 +538,7 @@
         shutdown(sock, 2);
     }
     *val = (err ? -1 : sock);
-    dprintf("< err=%d val=%d\n", err, *val);
+    dprintf("< varp_mcast_open err=%d val=%d\n", err, *val);
     return err;
 }
 
@@ -554,7 +554,7 @@
     int flags = (VSOCK_BIND | VSOCK_REUSE);
     dprintf(">\n");
     err = create_socket(SOCK_DGRAM, addr, port, flags, val);
-    dprintf("< err=%d val=%d\n", err, *val);
+    dprintf("< varp_ucast_open err=%d val=%d\n", err, *val);
     return err;
 }
 
@@ -733,7 +733,7 @@
     sock_set_callback(varp_mcast_sock);
   exit:
     set_fs(oldfs);
-    dprintf("< err=%d\n", err);
+    dprintf("< varp_socket_open err=%d\n", err);
     return err;
 }	
 
@@ -792,7 +792,7 @@
     sock_remove_wait_queue(varp_mcast_sock, &mcast_wait);
     varp_sockets_close();
     if(err){
-        eprintf("%s< err=%d\n", __FUNCTION__, err);
+        eprintf("%s< varp_main err=%d\n", __FUNCTION__, err);
     }
     varp_thread_err = err;
     atomic_set(&varp_state, VARP_STATE_EXITED);
@@ -842,7 +842,7 @@
 #endif
   exit:
     if(err){
-        wprintf("> err=%d\n", err);
-    }
-    return err;
-}
+        wprintf("> varp_open err=%d\n", err);
+    }
+    return err;
+}
diff -r 18eecf71f690 tools/vnet/vnet-module/vnet.c
--- a/tools/vnet/vnet-module/vnet.c	Fri Mar 31 13:39:42 2006
+++ b/tools/vnet/vnet-module/vnet.c	Fri Mar 31 15:42:56 2006
@@ -448,7 +448,7 @@
     }
 #endif
   exit:
-    dprintf("< err=%d\n", err);
+    dprintf("< _skb_xmit err=%d\n", err);
     return err;
 }
 
@@ -486,7 +486,7 @@
         vif_update(vnet, (Vmac*)eth_hdr(skb)->h_source);
         err = varp_output(skb, vnet);
     }
-    //dprintf("< err=%d\n", err);
+    //dprintf("< vnet_skb_send err=%d\n", err);
     return err;
 }
 
diff -r 18eecf71f690 tools/vnet/vnet-module/vnet_eval.c
--- a/tools/vnet/vnet-module/vnet_eval.c	Fri Mar 31 13:39:42 2006
+++ b/tools/vnet/vnet-module/vnet_eval.c	Fri Mar 31 15:42:56 2006
@@ -354,7 +354,7 @@
             break;
         }
     }
-    iprintf("< err=%d\n", err);
+    iprintf("< vnet_eval_defs err=%d\n", err);
     return err;
 }
 
diff -r 18eecf71f690 tools/vnet/vnet-module/vnet_ioctl.c
--- a/tools/vnet/vnet-module/vnet_ioctl.c	Fri Mar 31 13:39:42 2006
+++ b/tools/vnet/vnet-module/vnet_ioctl.c	Fri Mar 31 15:42:56 2006
@@ -247,7 +247,7 @@
   exit:
     Parser_free(parser);
     file->private_data = NULL;
-    dprintf("< err=%d\n", err);
+    dprintf("< proc_policy_release err=%d\n", err);
     return err;
 }
 
@@ -301,7 +301,7 @@
     int err = 0;
     IOStream *io = file->private_data;
     if(io) IOStream_close(io);
-    dprintf("< err=%d\n", err);
+    dprintf("< proc_io_release_fn err=%d\n", err);
     return err;
 }