diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-09-05 10:39:22 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-09-05 10:39:22 +0200 |
| commit | 1729b1798e1bfd4614a9cf7cf651cee8b6923283 (patch) | |
| tree | 0eab8d4a22e0bc795f15c3062500a420d801ef4c /net | |
| parent | 8f9d4007c53cefc513619b83b5b81b146423b11b (diff) | |
| parent | 338b6e7edc054523e2cc0dec77ab3aa1716a385f (diff) | |
| download | barebox-1729b1798e1bfd4614a9cf7cf651cee8b6923283.tar.gz barebox-1729b1798e1bfd4614a9cf7cf651cee8b6923283.tar.xz | |
Merge branch 'for-next/boardinfo'
Conflicts:
arch/mips/boards/qemu-malta/init.c
commands/bootm.c
drivers/of/base.c
Diffstat (limited to 'net')
| -rw-r--r-- | net/dhcp.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/dhcp.c b/net/dhcp.c index 1261b2d73a..ff54924762 100644 --- a/net/dhcp.c +++ b/net/dhcp.c @@ -667,7 +667,7 @@ static void dhcp_global_add(const char *var) if (!var_global) return; - globalvar_add_simple(var_global); + globalvar_add_simple(var_global, NULL); free(var_global); } @@ -830,7 +830,6 @@ BAREBOX_CMD_START(dhcp) BAREBOX_CMD_COMPLETE(empty_complete) BAREBOX_CMD_END -BAREBOX_MAGICVAR_NAMED(global_hostname, global.hostname, "hostname to send or returned from DHCP request"); BAREBOX_MAGICVAR_NAMED(global_dhcp_bootfile, global.dhcp.bootfile, "bootfile returned from DHCP request"); BAREBOX_MAGICVAR_NAMED(global_dhcp_rootpath, global.dhcp.rootpath, "rootpath returned from DHCP request"); BAREBOX_MAGICVAR_NAMED(global_dhcp_vendor_id, global.dhcp.vendor_id, "vendor id to send to the DHCP server"); |