From 85ab89fd27347032bc1930e31615f71a5078b047 Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Mon, 2 Nov 2020 17:59:19 +0100
Subject: Improved error handling in rtl driver

---
 kernel/features/net.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'kernel/features/net.c')

diff --git a/kernel/features/net.c b/kernel/features/net.c
index 447d781..90d7bab 100644
--- a/kernel/features/net.c
+++ b/kernel/features/net.c
@@ -49,8 +49,8 @@ u16 icmp_calculate_checksum(struct icmp_packet *packet)
 void *dhcp_get_options(struct dhcp_packet *packet, u8 type)
 {
 	u8 *options = packet->options + 4;
-	u8 curr_type = *options;
-	while (curr_type != 0xff) {
+	u8 curr_type = 0;
+	while ((curr_type = *options) != 0xff) {
 		u8 len = *(options + 1);
 		if (curr_type == type) {
 			void *ret = malloc(len);
@@ -285,7 +285,7 @@ void dhcp_make_packet(struct dhcp_packet *packet, u8 msg_type)
 	packet->hardware_type = HARDWARE_TYPE_ETHERNET;
 	packet->mac_len = 6;
 	packet->hops = 0;
-	packet->xid = htonl(0x41c6);
+	packet->xid = htonl(DHCP_TRANSACTION_IDENTIFIER);
 	packet->flags = htons(0x0001);
 	memcpy(packet->client_mac, rtl8139_get_mac(), 6);
 
-- 
cgit v1.2.3