Lncvrt/grub
1
0 Fork 0
mirror of https://git.savannah.gnu.org/git/grub.git synced 2026-10-20 22:48:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge mainline into net

Browse Source
This commit is contained in:
Vladimir 'phcoder' Serbinenko committed 2010-09-22 20:13:00 +02:00
2 parents 90451bb1c9 7835dfd3e8
commit 760a7e5aed
521 files changed
+54590 -8041
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

grub-core/net/i386/pc/pxe.c
+2 -1
View File
@@ -185,6 +185,7 @@ grub_pxefs_open (struct grub_file *file, const char *name)
}
file->data = data;
file->not_easly_seekable = 1;
grub_memcpy (file_int, file, sizeof (struct grub_file));
curr_file = file_int;
@@ -229,7 +230,7 @@ grub_pxefs_read (grub_file_t file, char *buf, grub_size_t len)
o.gateway_ip = data->gateway_ip;
grub_strcpy ((char *)&o.filename[0], data->filename);
o.tftp_port = grub_cpu_to_be16 (GRUB_PXE_TFTP_PORT);
o.packet_size = grub_pxe_blksize;
o.packet_size = data->block_size;
grub_pxe_call (GRUB_PXENV_TFTP_OPEN, &o, pxe_rm_entry);
if (o.status)
{