From 6c01d3bb95c8dfbbbc3f2b4fb36fce6bd2f3e952 Mon Sep 17 00:00:00 2001
From: Michael Brown
Date: Mon, 17 Jul 2006 13:07:14 +0000
Subject: Fix creation of the htype field; the ll_proto field from which it is
 derived is a 16-bit big-endian field, but htype is only 8 bits wide.

---
 src/net/udp/dhcp.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'src/net')

diff --git a/src/net/udp/dhcp.c b/src/net/udp/dhcp.c
index 1523e404b..7e9af09f7 100644
--- a/src/net/udp/dhcp.c
+++ b/src/net/udp/dhcp.c
@@ -29,11 +29,6 @@
  *
  */
 
-struct dhcp_session {
-	struct net_device *netdev;
-	uint32_t xid;
-};
-
 /** DHCP operation types
  *
  * This table maps from DHCP message types (i.e. values of the @c
@@ -186,7 +181,7 @@ size_t dhcp_assemble ( struct dhcp_session *dhcp, void *data,
 	dhcppkt->op = dhcp_op[dhcp_message_type];
 
 	/* Fill in NIC details */
-	dhcppkt->htype = dhcp->netdev->ll_protocol->ll_proto;
+	dhcppkt->htype = ntohs ( dhcp->netdev->ll_protocol->ll_proto );
 	dhcppkt->hlen = dhcp->netdev->ll_protocol->ll_addr_len;
 	memcpy ( dhcppkt->chaddr, dhcp->netdev->ll_addr, dhcppkt->hlen );
 
-- 
cgit v1.2.3-55-g7522