Jiri Slaby
4a27c23e24
- add grub2-fix-tftp-endianness.patch from upstream (bnc#808582) - add efinet and tftp to grub.efi (bnc#808582) OBS-URL: https://build.opensuse.org/request/show/158250 OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=25
39 lines
1.1 KiB
Diff
39 lines
1.1 KiB
Diff
From: Vladimir Serbinenko <phcoder@gmail.com>
|
|
Subject: grub-core/net/tftp.c: fix endianness problem.
|
|
|
|
* grub-core/net/tftp.c (ack): Fix endianness problem.
|
|
(tftp_receive): Likewise.
|
|
|
|
Reported by: Michael Davidsave
|
|
|
|
Signed-off-by: Michael Chang <mchang@suse.com>
|
|
---
|
|
grub-core/net/tftp.c | 4 ++--
|
|
1 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/grub-core/net/tftp.c b/grub-core/net/tftp.c
|
|
index 9c70efb..d0f39ea 100644
|
|
--- a/grub-core/net/tftp.c
|
|
+++ b/grub-core/net/tftp.c
|
|
@@ -143,7 +143,7 @@ ack (tftp_data_t data, grub_uint16_t block)
|
|
|
|
tftph_ack = (struct tftphdr *) nb_ack.data;
|
|
tftph_ack->opcode = grub_cpu_to_be16 (TFTP_ACK);
|
|
- tftph_ack->u.ack.block = block;
|
|
+ tftph_ack->u.ack.block = grub_cpu_to_be16 (block);
|
|
|
|
err = grub_net_send_udp_packet (data->sock, &nb_ack);
|
|
if (err)
|
|
@@ -225,7 +225,7 @@ tftp_receive (grub_net_udp_socket_t sock __attribute__ ((unused)),
|
|
grub_priority_queue_pop (data->pq);
|
|
|
|
if (file->device->net->packs.count < 50)
|
|
- err = ack (data, tftph->u.data.block);
|
|
+ err = ack (data, data->block + 1);
|
|
else
|
|
{
|
|
file->device->net->stall = 1;
|
|
--
|
|
1.7.3.4
|
|
|