summaryrefslogtreecommitdiff
path: root/common/ethernet.c
diff options
context:
space:
mode:
authorTed Lemon <source@isc.org>2000-03-24 00:22:20 +0000
committerTed Lemon <source@isc.org>2000-03-24 00:22:20 +0000
commita770670edffbbd823a6d9d7564509c71f1695660 (patch)
treefa11f1862370a3155aaddc1e2d07f3a4cfd6cc25 /common/ethernet.c
parent95e585542a4b94f0809f9f7e38ab20df7cd1fae8 (diff)
downloadisc-dhcp-a770670edffbbd823a6d9d7564509c71f1695660.tar.gz
Get rid of cobwebs.
Diffstat (limited to 'common/ethernet.c')
-rw-r--r--common/ethernet.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/common/ethernet.c b/common/ethernet.c
index 573e0d1b..772392e9 100644
--- a/common/ethernet.c
+++ b/common/ethernet.c
@@ -1,4 +1,4 @@
-/* packet.c
+/* ethernet.c
Packet assembly code, originally contributed by Archie Cobbs. */
@@ -43,7 +43,7 @@
#ifndef lint
static char copyright[] =
-"$Id: ethernet.c,v 1.5 2000/03/17 03:59:01 mellon Exp $ Copyright (c) 1996-2000 The Internet Software Consortium. All rights reserved.\n";
+"$Id: ethernet.c,v 1.6 2000/03/24 00:22:20 mellon Exp $ Copyright (c) 1996-2000 The Internet Software Consortium. All rights reserved.\n";
#endif /* not lint */
#include "dhcpd.h"
@@ -54,7 +54,6 @@ static char copyright[] =
#if defined (PACKET_ASSEMBLY)
/* Assemble an hardware header... */
-/* XXX currently only supports ethernet; doesn't check for other types. */
void assemble_ethernet_header (interface, buf, bufix, to)
struct interface_info *interface;
@@ -75,11 +74,7 @@ void assemble_ethernet_header (interface, buf, bufix, to)
else
memset (eh.ether_shost, 0x00, sizeof (eh.ether_shost));
-#ifdef BROKEN_FREEBSD_BPF /* Fixed in FreeBSD 2.2 */
- eh.ether_type = ETHERTYPE_IP;
-#else
eh.ether_type = htons (ETHERTYPE_IP);
-#endif
memcpy (&buf [*bufix], &eh, ETHER_HEADER_SIZE);
*bufix += ETHER_HEADER_SIZE;