svn commit: r261543 - head/sys/dev/usb/net

[Hans Petter Selasky]

Author: hselasky
Date: Thu Feb  6 10:38:40 2014
New Revision: 261543
URL: http://svnweb.freebsd.org/changeset/base/261543

Log:
  Fix kernelbuild when full debugging features are enabled.
  
  Pointyhat:	hselasky @
  MFC after:	2 weeks

Modified:
  head/sys/dev/usb/net/if_urndis.c
  head/sys/dev/usb/net/if_urndisreg.h

Modified: head/sys/dev/usb/net/if_urndis.c
==============================================================================
--- head/sys/dev/usb/net/if_urndis.c	Thu Feb  6 09:57:27 2014	(r261542)
+++ head/sys/dev/usb/net/if_urndis.c	Thu Feb  6 10:38:40 2014	(r261543)
@@ -838,7 +838,7 @@ urndis_bulk_read_callback(struct usb_xfe
 				DPRINTF("invalid dataoffset %u larger than %u\n",
 				    msg.rm_dataoffset + msg.rm_datalen +
 				    (uint32_t)__offsetof(struct urndis_packet_msg,
-				    rm_dataoffset));
+				    rm_dataoffset), actlen);
 				goto tr_setup;
 			} else if (msg.rm_datalen < (uint32_t)sizeof(struct ether_header)) {
 				ifp->if_ierrors++;

Modified: head/sys/dev/usb/net/if_urndisreg.h
==============================================================================
--- head/sys/dev/usb/net/if_urndisreg.h	Thu Feb  6 09:57:27 2014	(r261542)
+++ head/sys/dev/usb/net/if_urndisreg.h	Thu Feb  6 10:38:40 2014	(r261543)
@@ -53,7 +53,7 @@ struct urndis_softc {
 
 #define	URNDIS_LOCK(sc) mtx_lock(&(sc)->sc_mtx)
 #define	URNDIS_UNLOCK(sc) mtx_unlock(&(sc)->sc_mtx)
-#define	URNDIS_LOCK_ASSERT(sc, what) mtx_assert(&(sc)->sc_mtx, (x))
+#define	URNDIS_LOCK_ASSERT(sc, what) mtx_assert(&(sc)->sc_mtx, (what))
 
 #define	RNDIS_STATUS_BUFFER_OVERFLOW 	0x80000005L
 #define	RNDIS_STATUS_FAILURE 		0xC0000001L