summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorJon Loeliger <jdl@freescale.com>2006-10-10 17:21:42 -0500
committerJon Loeliger <jdl@freescale.com>2006-10-10 17:21:42 -0500
commitdaaba9859b0b94571dc3e45ad0c26e136426b351 (patch)
tree688c9068794d45f78f9347cb47b7fba55a4b10be /net
parent1fd5699a4a24f5c1dab1b32f480bace1ebb9fc3e (diff)
parenta3bb7bfc06a9ccb7e2f91ccc54a90ae69177214f (diff)
Merge branch 'master' of http://www.denx.de/git/u-boot
Diffstat (limited to 'net')
-rw-r--r--net/Makefile2
-rw-r--r--net/bootp.c7
2 files changed, 7 insertions, 2 deletions
diff --git a/net/Makefile b/net/Makefile
index 6fe4002b61..d18460cab3 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -35,7 +35,7 @@ OBJS := $(addprefix $(obj),$(COBJS))
all: $(LIB)
$(LIB): $(obj).depend $(OBJS)
- $(AR) crv $@ $(OBJS)
+ $(AR) $(ARFLAGS) $@ $(OBJS)
#########################################################################
diff --git a/net/bootp.c b/net/bootp.c
index 669d74a6a5..8f1382e945 100644
--- a/net/bootp.c
+++ b/net/bootp.c
@@ -851,7 +851,12 @@ static void DhcpSendRequestPkt(Bootp_t *bp_offer)
NetCopyIP(&bp->bp_ciaddr, &bp_offer->bp_ciaddr); /* both in network byte order */
NetCopyIP(&bp->bp_yiaddr, &bp_offer->bp_yiaddr);
NetCopyIP(&bp->bp_siaddr, &bp_offer->bp_siaddr);
- NetCopyIP(&bp->bp_giaddr, &bp_offer->bp_giaddr);
+ /*
+ * RFC3046 requires Relay Agents to discard packets with
+ * nonzero and offered giaddr
+ */
+ NetWriteIP(&bp->bp_giaddr, 0);
+
memcpy (bp->bp_chaddr, NetOurEther, 6);
/*