From cc35fe8f31485e48041352667bdd67b66b65fd17 Mon Sep 17 00:00:00 2001 From: Vladimir 'phcoder' Serbinenko Date: Tue, 19 Jun 2012 11:25:37 +0200 Subject: [PATCH] * grub-core/net/drivers/ieee1275/ofnet.c (get_card_packet): Fix packet presence check. (grub_ieee1275_net_config_real): Fix config pointer. --- ChangeLog | 6 ++++++ grub-core/net/drivers/ieee1275/ofnet.c | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 16213a794..b401bda35 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-06-19 Vladimir Serbinenko + + * grub-core/net/drivers/ieee1275/ofnet.c (get_card_packet): Fix packet + presence check. + (grub_ieee1275_net_config_real): Fix config pointer. + 2012-06-19 Vladimir Serbinenko * grub-core/kern/ieee1275/openfw.c (grub_ieee1275_parse_args): Extend diff --git a/grub-core/net/drivers/ieee1275/ofnet.c b/grub-core/net/drivers/ieee1275/ofnet.c index fb9f31cf6..a31b77fe0 100644 --- a/grub-core/net/drivers/ieee1275/ofnet.c +++ b/grub-core/net/drivers/ieee1275/ofnet.c @@ -96,7 +96,7 @@ get_card_packet (struct grub_net_card *dev) do rc = grub_ieee1275_read (data->handle, nb->data, dev->mtu + 64, &actual); while ((actual <= 0 || rc < 0) && (grub_get_time_ms () - start_time < 200)); - if (actual) + if (actual > 0) { grub_netbuff_put (nb, actual); return nb; @@ -176,8 +176,8 @@ grub_ieee1275_net_config_real (const char *devpath, char **device, char **path) grub_net_configure_by_dhcp_ack (card->name, card, 0, (struct grub_net_bootp_packet *) - &bootp_response - + bootp_response_properties[i].offset, + (bootp_response + + bootp_response_properties[i].offset), size - bootp_response_properties[i].offset, 1, device, path); return;