Author: thompsa
Date: Fri Nov 19 01:47:46 2010
New Revision: 215499
URL: http://svn.freebsd.org/changeset/base/215499
Log:
MFC r212133
Fix setting of the rx_max and tx_max variables. If the expected buffer size
is
greater than 65535 bytes then the CDC driver might not work as expected,
which
is not likely with the existing USB speeds.
Modified:
stable/8/sys/dev/usb/net/if_cdce.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
stable/8/sys/dev/xen/xenpci/ (props changed)
Modified: stable/8/sys/dev/usb/net/if_cdce.c
==============================================================================
--- stable/8/sys/dev/usb/net/if_cdce.c Fri Nov 19 01:47:09 2010
(r215498)
+++ stable/8/sys/dev/usb/net/if_cdce.c Fri Nov 19 01:47:46 2010
(r215499)
@@ -312,14 +312,14 @@ cdce_ncm_init(struct cdce_softc *sc)
/* Read correct set of parameters according to device mode */
if (usbd_get_mode(sc->sc_ue.ue_udev) == USB_MODE_HOST) {
- sc->sc_ncm.rx_max = UGETW(temp.dwNtbInMaxSize);
- sc->sc_ncm.tx_max = UGETW(temp.dwNtbOutMaxSize);
+ sc->sc_ncm.rx_max = UGETDW(temp.dwNtbInMaxSize);
+ sc->sc_ncm.tx_max = UGETDW(temp.dwNtbOutMaxSize);
sc->sc_ncm.tx_remainder = UGETW(temp.wNdpOutPayloadRemainder);
sc->sc_ncm.tx_modulus = UGETW(temp.wNdpOutDivisor);
sc->sc_ncm.tx_struct_align = UGETW(temp.wNdpOutAlignment);
} else {
- sc->sc_ncm.rx_max = UGETW(temp.dwNtbOutMaxSize);
- sc->sc_ncm.tx_max = UGETW(temp.dwNtbInMaxSize);
+ sc->sc_ncm.rx_max = UGETDW(temp.dwNtbOutMaxSize);
+ sc->sc_ncm.tx_max = UGETDW(temp.dwNtbInMaxSize);
sc->sc_ncm.tx_remainder = UGETW(temp.wNdpInPayloadRemainder);
sc->sc_ncm.tx_modulus = UGETW(temp.wNdpInDivisor);
sc->sc_ncm.tx_struct_align = UGETW(temp.wNdpInAlignment);
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
