diff options
author | David Gwynne <dlg@cvs.openbsd.org> | 2005-01-30 13:22:59 +0000 |
---|---|---|
committer | David Gwynne <dlg@cvs.openbsd.org> | 2005-01-30 13:22:59 +0000 |
commit | 5d60085cad7f117b6d42537a4c1959fed5b31094 (patch) | |
tree | a221fb3709ccfb997a56365a39176617e7cbda7f /sys/dev | |
parent | 6696f7ba111a15d39f05c0aaa9ee6e5b1ebea900 (diff) |
dont redefine ETHER_ALIGN
Diffstat (limited to 'sys/dev')
-rw-r--r-- | sys/dev/usb/if_udavreg.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/sys/dev/usb/if_udavreg.h b/sys/dev/usb/if_udavreg.h index 4179a6aed5a..c53371e8582 100644 --- a/sys/dev/usb/if_udavreg.h +++ b/sys/dev/usb/if_udavreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_udavreg.h,v 1.2 2004/12/30 07:43:09 dlg Exp $ */ +/* $OpenBSD: if_udavreg.h,v 1.3 2005/01/30 13:22:58 dlg Exp $ */ /* $NetBSD: if_udavreg.h,v 1.2 2003/09/04 15:17:39 tsutsui Exp $ */ /* $nabe: if_udavreg.h,v 1.2 2003/08/21 16:26:40 nabe Exp $ */ /* @@ -40,13 +40,6 @@ #define UDAV_TX_TIMEOUT 1000 #define UDAV_TIMEOUT 10000 -#define ETHER_ALIGN 2 - - -/* Packet length */ -#define UDAV_MAX_MTU 1536 /* XXX: max frame size is unknown */ -#define UDAV_MIN_FRAME_LEN 60 -#define UDAV_BUFSZ UDAV_MAX_MTU /* Request */ #define UDAV_REQ_REG_READ 0x00 /* Read from register(s) */ @@ -219,3 +212,7 @@ struct udav_rx_hdr { } UPACKED; #define UDAV_RX_HDRLEN sizeof(struct udav_rx_hdr) +/* Packet length */ +#define UDAV_MAX_MTU 1536 /* XXX: max frame size is unknown */ +#define UDAV_MIN_FRAME_LEN 60 +#define UDAV_BUFSZ UDAV_MAX_MTU + UDAV_RX_HDRLEN |