Lncvrt/grub
1
0 Fork 0
mirror of https://git.savannah.gnu.org/git/grub.git synced 2026-10-26 17:19:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into next

Browse Source 
Conflicts:
	ChangeLog-2015
	grub-core/net/drivers/ieee1275/ofnet.c
	include/grub/ieee1275/ieee1275.h
This commit is contained in:
Vladimir Serbinenko committed 2015-02-27 01:05:08 +01:00
2 parents af768f8d41 66b0e6649b
commit c4748ead11
356 files changed
+7556 -2351
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

grub-core/net/drivers/i386/pc/pxe.c
+1 -2
View File
@@ -218,8 +218,7 @@ grub_pxe_recv (struct grub_net_card *dev __attribute__ ((unused)))
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 (buf, 2);
if (!buf)
if (grub_netbuff_reserve (buf, 2))
{
grub_netbuff_free (buf);
return NULL;