summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorDamien Bergamini <damien@cvs.openbsd.org>2006-07-18 19:59:05 +0000
committerDamien Bergamini <damien@cvs.openbsd.org>2006-07-18 19:59:05 +0000
commitea75c3fe071c094cb04ad1de1a73f951895ed471 (patch)
tree634bf253fc618b90e8f18b6b1849a4cff75ad3f2 /sys/dev
parent4c61ccdb23f58fb6d94404b2cbfe7d2a5f1c54ec (diff)
RT2501USB needs to reserve room for a 32bit value aligned on a 32bit
boundary at the end of each data transfer (unlike RT2500USB which reserves only 16bit).
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/usb/if_rum.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/sys/dev/usb/if_rum.c b/sys/dev/usb/if_rum.c
index 48cff3fe989..78e34003264 100644
--- a/sys/dev/usb/if_rum.c
+++ b/sys/dev/usb/if_rum.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_rum.c,v 1.5 2006/07/18 19:56:12 damien Exp $ */
+/* $OpenBSD: if_rum.c,v 1.6 2006/07/18 19:59:04 damien Exp $ */
/*-
* Copyright (c) 2005, 2006 Damien Bergamini <damien.bergamini@free.fr>
* Copyright (c) 2006 Niall O'Higgins <niallo@openbsd.org>
@@ -1012,7 +1012,7 @@ rum_tx_bcn(struct rum_softc *sc, struct mbuf *m0, struct ieee80211_node *ni)
return ENOMEM;
/* xfer length needs to be a multiple of two! */
- xferlen = (RT2573_TX_DESC_SIZE + m0->m_pkthdr.len + 1) & ~1;
+ xferlen = (RT2573_TX_DESC_SIZE + m0->m_pkthdr.len + 3) & ~3;
buf = usbd_alloc_buffer(xfer, xferlen);
if (buf == NULL) {
@@ -1105,15 +1105,15 @@ rum_tx_mgt(struct rum_softc *sc, struct mbuf *m0, struct ieee80211_node *ni)
m_copydata(m0, 0, m0->m_pkthdr.len, data->buf + RT2573_TX_DESC_SIZE);
rum_setup_tx_desc(sc, desc, flags, m0->m_pkthdr.len, rate);
- /* align end on a 2-bytes boundary */
- xferlen = (RT2573_TX_DESC_SIZE + m0->m_pkthdr.len + 1) & ~1;
+ /* align end on a 4-bytes boundary */
+ xferlen = (RT2573_TX_DESC_SIZE + m0->m_pkthdr.len + 3) & ~3;
/*
- * No space left in the last URB to store the extra 2 bytes, force
+ * No space left in the last URB to store the extra 4 bytes, force
* sending of another URB.
*/
if ((xferlen % 64) == 0)
- xferlen += 2;
+ xferlen += 4;
DPRINTFN(10, ("%s: sending mgt frame len=%u rate=%u xfer len=%u\n",
USBDEVNAME(sc->sc_dev), m0->m_pkthdr.len, rate, xferlen));
@@ -1208,14 +1208,14 @@ rum_tx_data(struct rum_softc *sc, struct mbuf *m0, struct ieee80211_node *ni)
rum_setup_tx_desc(sc, desc, flags, m0->m_pkthdr.len, rate);
/* align end on a 2-bytes boundary */
- xferlen = (RT2573_TX_DESC_SIZE + m0->m_pkthdr.len + 1) & ~1;
+ xferlen = (RT2573_TX_DESC_SIZE + m0->m_pkthdr.len + 3) & ~3;
/*
* No space left in the last URB to store the extra 2 bytes, force
* sending of another URB.
*/
if ((xferlen % 64) == 0)
- xferlen += 2;
+ xferlen += 4;
DPRINTFN(10, ("%s: sending data frame len=%u rate=%u xfer len=%u\n",
USBDEVNAME(sc->sc_dev), m0->m_pkthdr.len, rate, xferlen));