From ecc3cb5682637f375c6733e38e0a3220c2793739 Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin" Date: Tue, 26 Apr 2011 17:41:20 -0700 Subject: [PATCH] pxe: minor initialization cleanups Remove duplicate or dead code, move http_bake_cookies() to a more logical place. Signed-off-by: H. Peter Anvin --- core/fs/pxe/pxe.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/core/fs/pxe/pxe.c b/core/fs/pxe/pxe.c index 4bf8d00..3242a9f 100644 --- a/core/fs/pxe/pxe.c +++ b/core/fs/pxe/pxe.c @@ -851,8 +851,8 @@ static void network_init(void) if (have_uuid) sysappend_set_uuid(uuid); ip_init(); - http_bake_cookies(); print_sysappend(); + http_bake_cookies(); /* * Check to see if we got any PXELINUX-specific DHCP options; in particular, @@ -873,12 +873,6 @@ static void network_init(void) for (i = 0; i < DNS_MAX_SERVERS; i++) { /* Transfer the DNS information to lwip */ - dprintf("DNS server %d = %d.%d.%d.%d\n", - i, - ((uint8_t *)&dns_server[i])[0], - ((uint8_t *)&dns_server[i])[1], - ((uint8_t *)&dns_server[i])[2], - ((uint8_t *)&dns_server[i])[3]); dns_setserver(i, (struct ip_addr *)&dns_server[i]); } } @@ -898,10 +892,6 @@ static int pxe_fs_init(struct fs_info *fs) fs->sector_shift = fs->block_shift = TFTP_BLOCKSIZE_LG2; fs->sector_size = fs->block_size = 1 << TFTP_BLOCKSIZE_LG2; - /* This block size is actually arbitrary... */ - fs->sector_shift = fs->block_shift = TFTP_BLOCKSIZE_LG2; - fs->sector_size = fs->block_size = 1 << TFTP_BLOCKSIZE_LG2; - /* Find the PXE stack */ if (pxe_init(false)) kaboom(); -- 2.7.4