diff options
| author | Marcus Glocker <mglocker@cvs.openbsd.org> | 2008-01-04 10:04:08 +0000 |
|---|---|---|
| committer | Marcus Glocker <mglocker@cvs.openbsd.org> | 2008-01-04 10:04:08 +0000 |
| commit | 57eac29b569c5c56b435eb66ce9139d947d4cba4 (patch) | |
| tree | 50e60a39f4e4a4be1ff186b4a695f1c32ec72e13 | |
| parent | 9455d7d032d11c40027a1333f5bee05a3a6307dd (diff) | |
Fix TX padding.
| -rw-r--r-- | sys/dev/usb/if_upgt.c | 5 | ||||
| -rw-r--r-- | sys/dev/usb/if_upgtvar.h | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/sys/dev/usb/if_upgt.c b/sys/dev/usb/if_upgt.c index cb2f4f2ea9c..dd9d94652cf 100644 --- a/sys/dev/usb/if_upgt.c +++ b/sys/dev/usb/if_upgt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_upgt.c,v 1.14 2008/01/03 14:47:19 mglocker Exp $ */ +/* $OpenBSD: if_upgt.c,v 1.15 2008/01/04 10:04:07 mglocker Exp $ */ /* * Copyright (c) 2007 Marcus Glocker <mglocker@openbsd.org> @@ -69,7 +69,6 @@ * Sebastien Bourdeauducq <lekernel@prism54.org>. */ -#define UPGT_DEBUG #ifdef UPGT_DEBUG int upgt_debug = 2; #define DPRINTF(l, x...) do { if ((l) <= upgt_debug) printf(x); } while (0) @@ -1481,7 +1480,7 @@ upgt_tx_task(void *arg) */ bcopy(rates_11b, txdesc->rates, sizeof(txdesc->rates)); txdesc->type = htole32(UPGT_TX_DESC_TYPE_DATA); - txdesc->pad3 = UPGT_TX_DESC_PAD3_SIZE; + txdesc->pad3[0] = UPGT_TX_DESC_PAD3_SIZE; #if NBPFILTER > 0 if (sc->sc_drvbpf != NULL) { diff --git a/sys/dev/usb/if_upgtvar.h b/sys/dev/usb/if_upgtvar.h index 351f180a48b..465841356cc 100644 --- a/sys/dev/usb/if_upgtvar.h +++ b/sys/dev/usb/if_upgtvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_upgtvar.h,v 1.5 2008/01/01 20:20:30 mglocker Exp $ */ +/* $OpenBSD: if_upgtvar.h,v 1.6 2008/01/04 10:04:07 mglocker Exp $ */ /* * Copyright (c) 2007 Marcus Glocker <mglocker@openbsd.org> @@ -337,7 +337,7 @@ struct upgt_lmac_tx_desc { uint32_t pad2; uint32_t unknown1; uint32_t unknown2; - uint16_t pad3; + uint8_t pad3[2]; /* 802.11 frame data */ } __packed; |