Merge from Etherboot 5.4
[people/balajirrao/gpxe.git] / src / drivers / net / mlx_ipoib / patches / dhcpd.patch
1 diff -ru ../../orig/dhcp-3.0.4b2/common/options.c ./common/options.c
2 --- ../../orig/dhcp-3.0.4b2/common/options.c    2005-11-02 01:19:03.000000000 +0200
3 +++ ./common/options.c  2005-12-06 14:38:17.000000000 +0200
4 @@ -537,6 +537,7 @@
5         priority_list [priority_len++] = DHO_DHCP_LEASE_TIME;
6         priority_list [priority_len++] = DHO_DHCP_MESSAGE;
7         priority_list [priority_len++] = DHO_DHCP_REQUESTED_ADDRESS;
8 +       priority_list [priority_len++] = DHO_DHCP_CLIENT_IDENTIFIER;
9         priority_list [priority_len++] = DHO_FQDN;
10  
11         if (prl && prl -> len > 0) {
12 diff -ru ../../orig/dhcp-3.0.4b2/includes/site.h ./includes/site.h
13 --- ../../orig/dhcp-3.0.4b2/includes/site.h     2002-03-12 20:33:39.000000000 +0200
14 +++ ./includes/site.h   2005-12-06 14:36:55.000000000 +0200
15 @@ -135,7 +135,7 @@
16     the aforementioned problems do not matter to you, or if no other
17     API is supported for your system, you may want to go with it. */
18  
19 -/* #define USE_SOCKETS */
20 +#define USE_SOCKETS
21  
22  /* Define this to use the Sun Streams NIT API.
23