[src/netbsd-1-6]: src/sys/dev/usb Pullup revisions 1.6-1.7 (requested by bouy...

[jmc <jmc%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ff7337ba1a5e
branches:  netbsd-1-6
changeset: 529952:ff7337ba1a5e
user:      jmc <jmc%NetBSD.org@localhost>
date:      Mon Jan 27 05:14:44 2003 +0000

description:
Pullup revisions 1.6-1.7 (requested by bouyer in ticket #1095)
 When padding to URL_MIN_FRAME_LEN, memset the extra buffer space used.

diffstat:

 sys/dev/usb/if_url.c |  9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diffs (31 lines):

diff -r 256d69818ad6 -r ff7337ba1a5e sys/dev/usb/if_url.c
--- a/sys/dev/usb/if_url.c      Mon Jan 27 05:11:26 2003 +0000
+++ b/sys/dev/usb/if_url.c      Mon Jan 27 05:14:44 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_url.c,v 1.3 2002/05/13 12:10:04 augustss Exp $      */
+/*     $NetBSD: if_url.c,v 1.3.4.1 2003/01/27 05:14:44 jmc Exp $       */
 /*
  * Copyright (c) 2001, 2002
  *     Shingo WATANABE <nabe%nabechan.org@localhost>.  All rights reserved.
@@ -46,7 +46,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_url.c,v 1.3 2002/05/13 12:10:04 augustss Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_url.c,v 1.3.4.1 2003/01/27 05:14:44 jmc Exp $");
 
 #include "opt_inet.h"
 #include "opt_ns.h"
@@ -911,8 +911,11 @@
        c->url_mbuf = m;
        total_len = m->m_pkthdr.len;
 
-       if (total_len < URL_MIN_FRAME_LEN)
+       if (total_len < URL_MIN_FRAME_LEN) {
+               memset(c->url_buf + total_len, 0,
+                   URL_MIN_FRAME_LEN - total_len);
                total_len = URL_MIN_FRAME_LEN;
+       }
        usbd_setup_xfer(c->url_xfer, sc->sc_pipe_tx, c, c->url_buf, total_len,
                        USBD_FORCE_SHORT_XFER | USBD_NO_COPY,
                        URL_TX_TIMEOUT, url_txeof);