[PATCH] USB: Usbmon setup DMA patch

Alan Stern sent me this patch. It goes on top of the patch the adds
mon_dmapeek:
 http://ftp.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-04-usb/usb-usbmon-dma-areas.patch

Please be warned about ordering requirements or the build may fail.

Actually, mon_dmapeek is generic enough to support SETUP packets too.

Signed-off-by: Pete Zaitcev <zaitcev@redhat.com>
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/usb/mon/mon_text.c b/drivers/usb/mon/mon_text.c
index 417464d..17d0190 100644 (file)
--- a/drivers/usb/mon/mon_text.c
+++ b/drivers/usb/mon/mon_text.c
@@ -79,7 +79,7 @@ static inline char mon_text_get_setup(struct mon_event_text *ep,
                return '-';
 
        if (urb->transfer_flags & URB_NO_SETUP_DMA_MAP)
-               return 'D';
+               return mon_dmapeek(ep->setup, urb->setup_dma, SETUP_MAX);
        if (urb->setup_packet == NULL)
                return 'Z';     /* '0' would be not as pretty. */