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

Implement timeout when receiving packets.

Browse source
This commit is contained in:
Manoel Rebelo Abranches 2011-05-10 09:50:18 -03:00
parent a5184d629a
commit 0f231af8ae
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -42,24 +42,29 @@ send_card_buffer (struct grub_net_card *dev, struct grub_net_buff *pack)
pack->tail - pack->data, &actual); pack->tail - pack->data, &actual);
if (status) if (status)
return grub_error (GRUB_ERR_IO, "couldn't send network packet"); return grub_error (GRUB_ERR_IO, "Couldn't send network packet.");
return GRUB_ERR_NONE; return GRUB_ERR_NONE;
} }
static grub_err_t static grub_err_t
get_card_packet (struct grub_net_card *dev, struct grub_net_buff *pack) get_card_packet (struct grub_net_card *dev, struct grub_net_buff *nb)
{ {
int actual, rc; int actual, rc;
struct grub_ofnetcard_data *data = dev->data; struct grub_ofnetcard_data *data = dev->data;
grub_netbuff_clear(pack); grub_uint64_t start_time;
grub_netbuff_clear (nb);
start_time = grub_get_time_ms ();
do do
rc = grub_ieee1275_read (data->handle, pack->data, 1500, &actual); rc = grub_ieee1275_read (data->handle, nb->data, data->mtu, &actual);
while (actual <= 0 || rc < 0); while ((actual <= 0 || rc < 0) && (grub_get_time_ms () - start_time < 200));
grub_netbuff_put (pack, actual); if (actual)
{
return GRUB_ERR_NONE; grub_netbuff_put (nb, actual);
return grub_net_recv_ethernet_packet (nb);
}
return GRUB_ERR_TIMEOUT;
} }
static struct grub_net_card_driver ofdriver = static struct grub_net_card_driver ofdriver =