Module Name: src
Committed By: jym
Date: Wed Mar 30 18:33:05 UTC 2011
Modified Files:
src/sys/arch/xen/xen: if_xennet_xenbus.c
Log Message:
Do not clobber autoconf messages (and variables, for error reporting)
in xennet(4) handler. Keep if_xname though.
Reported by dyoung@, thanks.
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/xen/xen/if_xennet_xenbus.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/xen/xen/if_xennet_xenbus.c
diff -u src/sys/arch/xen/xen/if_xennet_xenbus.c:1.47 src/sys/arch/xen/xen/if_xennet_xenbus.c:1.48
--- src/sys/arch/xen/xen/if_xennet_xenbus.c:1.47 Wed Mar 30 00:17:04 2011
+++ src/sys/arch/xen/xen/if_xennet_xenbus.c Wed Mar 30 18:33:05 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_xennet_xenbus.c,v 1.47 2011/03/30 00:17:04 jym Exp $ */
+/* $NetBSD: if_xennet_xenbus.c,v 1.48 2011/03/30 18:33:05 jym Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -85,7 +85,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_xennet_xenbus.c,v 1.47 2011/03/30 00:17:04 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_xennet_xenbus.c,v 1.48 2011/03/30 18:33:05 jym Exp $");
#include "opt_xen.h"
#include "opt_nfs_boot.h"
@@ -961,7 +961,7 @@
}
MGETHDR(m, M_DONTWAIT, MT_DATA);
if (__predict_false(m == NULL)) {
- aprint_error_ifnet(ifp, "rx no mbuf\n");
+ printf("%s: rx no mbuf\n", ifp->if_xname);
ifp->if_ierrors++;
xennet_rx_mbuf_free(NULL, (void *)va, PAGE_SIZE, req);
continue;
