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

merge mainline into arm

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-05-11 10:24:24 +02:00
commit 8e71d87482
490 changed files with 29659 additions and 8612 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -79,7 +79,7 @@ send_card_buffer (struct grub_net_card *dev, struct grub_net_buff *pack)
grub_memcpy (dev->txbuf, pack->data, len);
status = grub_ieee1275_write (data->handle, dev->txbuf,
pack->tail - pack->data, &actual);
len, &actual);
if (status)
return grub_error (GRUB_ERR_IO, N_("couldn't send network packet"));
@ -97,10 +97,7 @@ get_card_packet (struct grub_net_card *dev)
nb = grub_netbuff_alloc (dev->mtu + 64 + 2);
if (!nb)
{
grub_netbuff_free (nb);
return NULL;
}
return NULL;
/* Reserve 2 bytes so that 2 + 14/18 bytes of ethernet header is divisible
by 4. So that IP header is aligned on 4 bytes. */
grub_netbuff_reserve (nb, 2);
@ -281,6 +278,9 @@ search_net_devices (struct grub_ieee1275_devalias *alias)
card->txbuf = grub_zalloc (card->txbufsize);
if (!card->txbuf)
{
grub_free (ofdata->path);
grub_free (ofdata);
grub_free (card);
grub_print_error ();
return 0;
}