summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenning Brauer <henning@cvs.openbsd.org>2004-02-23 18:27:38 +0000
committerHenning Brauer <henning@cvs.openbsd.org>2004-02-23 18:27:38 +0000
commita065e38538d0b61c5f5b4c2df10cc18583c4ff73 (patch)
tree5a86d71e361b570884bd66f28aee26eaef74c860
parent08d58d1353c85aa1a4ba31378a472f4054b78f08 (diff)
no token ring
-rw-r--r--sbin/dhclient/packet.c17
1 files changed, 3 insertions, 14 deletions
diff --git a/sbin/dhclient/packet.c b/sbin/dhclient/packet.c
index 008aa027f28..5632e2e2247 100644
--- a/sbin/dhclient/packet.c
+++ b/sbin/dhclient/packet.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: packet.c,v 1.4 2004/02/07 13:26:35 henning Exp $ */
+/* $OpenBSD: packet.c,v 1.5 2004/02/23 18:27:37 henning Exp $ */
/* Packet assembly code, originally contributed by Archie Cobbs. */
@@ -117,13 +117,7 @@ void
assemble_hw_header(struct interface_info *interface, unsigned char *buf,
int *bufix, struct hardware *to)
{
-#ifdef HAVE_TR_SUPPORT
- if (interface->hw_address.htype == HTYPE_IEEE802)
- assemble_tr_header(interface, buf, bufix, to);
- else
-#endif
- assemble_ethernet_header(interface, buf, bufix, to);
-
+ assemble_ethernet_header(interface, buf, bufix, to);
}
/*
@@ -184,12 +178,7 @@ ssize_t
decode_hw_header(struct interface_info *interface, unsigned char *buf,
int bufix, struct hardware *from)
{
-#ifdef HAVE_TR_SUPPORT
- if (interface->hw_address.htype == HTYPE_IEEE802)
- return (decode_tr_header(interface, buf, bufix, from));
- else
-#endif
- return (decode_ethernet_header(interface, buf, bufix, from));
+ return (decode_ethernet_header(interface, buf, bufix, from));
}
/*