vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* grub-core/net/drivers/ieee1275/ofnet.c (get_card_packet): Fix packet

Browse source 
presence check.
	(grub_ieee1275_net_config_real): Fix config pointer.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-06-19 11:25:37 +02:00
parent 970a0a09dd
commit cc35fe8f31
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2012-06-19 Vladimir Serbinenko <phcoder@gmail.com>
* 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 <phcoder@gmail.com> 2012-06-19 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/kern/ieee1275/openfw.c (grub_ieee1275_parse_args): Extend * grub-core/kern/ieee1275/openfw.c (grub_ieee1275_parse_args): Extend

6
grub-core/net/drivers/ieee1275/ofnet.c
View file

@ -96,7 +96,7 @@ get_card_packet (struct grub_net_card *dev)
do do
rc = grub_ieee1275_read (data->handle, nb->data, dev->mtu + 64, &actual); rc = grub_ieee1275_read (data->handle, nb->data, dev->mtu + 64, &actual);
while ((actual <= 0 || rc < 0) && (grub_get_time_ms () - start_time < 200)); while ((actual <= 0 || rc < 0) && (grub_get_time_ms () - start_time < 200));
if (actual) if (actual > 0)
{ {
grub_netbuff_put (nb, actual); grub_netbuff_put (nb, actual);
return nb; 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, grub_net_configure_by_dhcp_ack (card->name, card, 0,
(struct grub_net_bootp_packet *) (struct grub_net_bootp_packet *)
&bootp_response (bootp_response
+ bootp_response_properties[i].offset, + bootp_response_properties[i].offset),
size - bootp_response_properties[i].offset, size - bootp_response_properties[i].offset,
1, device, path); 1, device, path);
return; return;