From a3d991bd0da8b9fb9dbf2c7481091c3d082b9b13 Mon Sep 17 00:00:00 2001
From: wdenk <wdenk>
Date: Thu, 15 Apr 2004 21:48:45 +0000
Subject: Patches by Pantelis Antoniou, 30 Mar 2004: add networking support for
 VLANs (802.1q), and CDP (Cisco Discovery Protocol)

---
 net/bootp.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'net/bootp.c')

diff --git a/net/bootp.c b/net/bootp.c
index 21ce7b2..4bca50d 100644
--- a/net/bootp.c
+++ b/net/bootp.c
@@ -644,8 +644,7 @@ BootpRequest (void)
 	pkt = NetTxPacket;
 	memset ((void*)pkt, 0, PKTSIZE);
 
-	NetSetEther(pkt, NetBcastAddr, PROT_IP);
-	pkt += ETHER_HDR_SIZE;
+	pkt += NetSetEther(pkt, NetBcastAddr, PROT_IP);
 
 	/*
 	 * Next line results in incorrect packet size being transmitted, resulting
@@ -791,8 +790,7 @@ static void DhcpSendRequestPkt(Bootp_t *bp_offer)
 	pkt = NetTxPacket;
 	memset ((void*)pkt, 0, PKTSIZE);
 
-	NetSetEther(pkt, NetBcastAddr, PROT_IP);
-	pkt += ETHER_HDR_SIZE;
+	pkt += NetSetEther(pkt, NetBcastAddr, PROT_IP);
 
 	iphdr = pkt;		/* We'll need this later to set proper pkt size */
 	pkt += IP_HDR_SIZE;
-- 
cgit v1.1